Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 28 Apr 2011 14:30:45 +0000 (15:30 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 28 Apr 2011 14:30:45 +0000 (15:30 +0100)

Trivial merge