Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux...
Russell King [Fri, 11 Feb 2011 22:56:19 +0000 (22:56 +0000)]

Trivial merge