Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Russell King [Sat, 2 Jan 2010 11:16:20 +0000 (11:16 +0000)]

Trivial merge