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>
Wed, 21 Jul 2010 08:26:37 +0000 (09:26 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 21 Jul 2010 08:26:37 +0000 (09:26 +0100)

Trivial merge