Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 13 Apr 2011 22:32:13 +0000 (23:32 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 13 Apr 2011 22:32:13 +0000 (23:32 +0100)

Trivial merge