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)
commit10121a12e2380fb34b6e646a8e367add06d036c3
treed500294174e67cbb208eaf5d7f9741be48eca8a6
parent28d0325ce6e0a52f53d8af687e6427fee59004d3
parentdd5e8e6b1d4c218d2bafe002231ec460459ab5c4
Merge branch 'for-2.6.31' of git://git./linux/kernel/git/broonie/sound-2.6 into fix/asoc

Conflicts:
MAINTAINERS
MAINTAINERS