]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
Merge branch 'for-2.6.35' into for-2.6.36
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 15 Jun 2010 10:55:35 +0000 (11:55 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 15 Jun 2010 10:55:35 +0000 (11:55 +0100)

Trivial merge