review.tizen.org Git - platform/kernel/linux-stable.git/commit

projects / platform / kernel / linux-stable.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b1e4422 005b107)

author	Takashi Iwai <tiwai@suse.de>
	Thu, 9 Jul 2009 16:48:38 +0000 (18:48 +0200)
committer	Takashi Iwai <tiwai@suse.de>
	Thu, 9 Jul 2009 16:48:38 +0000 (18:48 +0200)
commit	305355aad89f1b7eb27cb210fad2f9d3c67b2572
tree	b7510300fae4fd06a29b2d773fb841e4ca3c8956	tree \| snapshot
parent	b1e4422f96a9b4830ffd8119b05211abb830ef4a	commit \| diff
parent	005b10769c05fb16db70f7689ffb5ba17e3fc324	commit \| diff

Merge branch 'fix/hda' into topic/hda

Conflicts:
sound/pci/hda/patch_realtek.c

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

sound/pci/hda/hda_beep.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_intel.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;