]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'acrux' into for-next
authorJiri Kosina <jkosina@suse.cz>
Thu, 4 Aug 2011 13:27:11 +0000 (15:27 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 4 Aug 2011 13:27:11 +0000 (15:27 +0200)

Trivial merge