Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Russell King [Mon, 16 Nov 2009 20:59:25 +0000 (20:59 +0000)]

Trivial merge