git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b258342 c53344e)

author	Takashi Iwai <tiwai@suse.de>
	Wed, 17 Feb 2010 13:24:46 +0000 (14:24 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Wed, 17 Feb 2010 13:24:46 +0000 (14:24 +0100)
commit	b03cc07b684f59353222b42dd9b6f59f039bc8c2
tree	7fe3ba3b95faeecb01e4feafb9288ef4b523c6b3	tree \| snapshot
parent	b25834240fb2bad84e9a2306a7fd739b5925a646	commit \| diff
parent	c53344e28947b19f613f435d456fe15d9ef50863	commit \| diff

Merge branch 'fix/misc' into topic/misc

Conflicts:
sound/pci/hda/patch_realtek.c

sound/core/pcm_native.c	diff1 \|	diff2 \|	blob \| history
sound/pci/atiixp.c	diff1 \|	diff2 \|	blob \| history
sound/pci/echoaudio/echoaudio.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
sound/pci/hda/patch_sigmatel.c	diff1 \|	diff2 \|	blob \| history
sound/pci/riptide/riptide.c	diff1 \|	diff2 \|	blob \| history
sound/usb/usbaudio.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.