Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorTakashi Iwai <tiwai@suse.de>
Thu, 23 Sep 2010 05:31:27 +0000 (07:31 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 23 Sep 2010 05:31:27 +0000 (07:31 +0200)

Trivial merge