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, 28 Jan 2010 21:59:58 +0000 (21:59 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 28 Jan 2010 21:59:58 +0000 (21:59 +0000)

Trivial merge