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>
Fri, 8 Jan 2010 16:18:37 +0000 (16:18 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 8 Jan 2010 16:18:37 +0000 (16:18 +0000)

Trivial merge