]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 9 Jul 2009 15:07:22 +0000 (16:07 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 9 Jul 2009 15:07:22 +0000 (16:07 +0100)

Trivial merge