]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 's6000' into for-2.6.31
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 7 Apr 2009 17:51:34 +0000 (18:51 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 7 Apr 2009 17:51:34 +0000 (18:51 +0100)

Trivial merge