Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorTakashi Iwai <tiwai@suse.de>
Wed, 2 Jun 2010 12:17:44 +0000 (14:17 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 2 Jun 2010 12:17:44 +0000 (14:17 +0200)

Trivial merge