Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 11 Feb 2011 22:56:19 +0000 (22:56 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 11 Feb 2011 22:56:19 +0000 (22:56 +0000)

Trivial merge