Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Russell King [Thu, 4 Jun 2009 16:02:58 +0000 (17:02 +0100)]

Trivial merge