Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 15 Apr 2009 08:58:21 +0000 (09:58 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 15 Apr 2009 08:58:21 +0000 (09:58 +0100)

Trivial merge