]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorTakashi Iwai <tiwai@suse.de>
Thu, 25 Jun 2009 13:28:14 +0000 (15:28 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 25 Jun 2009 13:28:14 +0000 (15:28 +0200)
commitf8549229f65b369610f4841233283c329d561973
treed500294174e67cbb208eaf5d7f9741be48eca8a6
parent89feb12dd08b870baab8a22265bbff269a80bcf8
parent129707e56fdb6f1422de452ec382bcc80909f3c4
Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc

Conflicts:
MAINTAINERS
MAINTAINERS