Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 1 Jul 2010 09:16:00 +0000 (10:16 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 1 Jul 2010 09:16:04 +0000 (10:16 +0100)

Trivial merge