git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 099d53c 535b6c5)

author	Takashi Iwai <tiwai@suse.de>
	Mon, 20 Aug 2012 20:14:26 +0000 (22:14 +0200)
committer	Takashi Iwai <tiwai@suse.de>
	Mon, 20 Aug 2012 20:14:26 +0000 (22:14 +0200)
commit	ddf83485d7da468251716b8040bac1280622181e
tree	d28e9b511dedcfed447577f4bb49a99b244a9430	tree \| snapshot
parent	099d53c308f50e8ee5b6638ec3f40f0104b3ee31	commit \| diff
parent	535b6c51fe8293c88ce919cdfc4390c67a1cb6d1	commit \| diff

Merge branch 'for-linus' into for-next

Conflicts:
sound/pci/hda/hda_codec.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>

sound/pci/cs46xx/cs46xx_lib.c	diff1 \|	diff2 \|	blob \| history
sound/pci/ctxfi/ctatc.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_codec.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_codec.h	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_intel.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_proc.c	diff1 \|	diff2 \|	blob \| history
sound/pci/sis7019.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git