]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 14 Jan 2011 08:05:38 +0000 (09:05 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 14 Jan 2011 08:05:38 +0000 (09:05 +0100)

Trivial merge