Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorTakashi Iwai <tiwai@suse.de>
Mon, 31 May 2010 16:13:20 +0000 (18:13 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 31 May 2010 16:13:20 +0000 (18:13 +0200)

Trivial merge