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: 2bce3c6 7e511df)

author	Takashi Iwai <tiwai@suse.de>
	Tue, 12 Jan 2010 08:40:08 +0000 (09:40 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Tue, 12 Jan 2010 08:40:08 +0000 (09:40 +0100)
commit	ed4706e00c59b1823ae222cba94c21e05f52fb64
tree	2fb8e026712bdf7848ea400e25118f6a58824a02	tree \| snapshot
parent	2bce3c6d3e7296fae3c61c60fe7a9afe7886b6ee	commit \| diff
parent	7e511df05c29d74cdf087ce9647ef9d7707dae1f	commit \| diff

Merge commit alsa/devel into topic/misc

Conflicts:
include/sound/version.h

include/sound/pcm.h	diff1 \|	diff2 \|	blob \| history
sound/core/pcm_lib.c	diff1 \|	diff2 \|	blob \| history
sound/core/pcm_native.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/hda_codec.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_analog.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_cirrus.c	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_conexant.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

Linux Kernel Source Tree.