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)
Conflicts:
MAINTAINERS


Trivial merge