Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
authorRussell King <[email protected]>
Tue, 23 Mar 2010 08:18:25 +0000 (08:18 +0000)
committerRussell King <[email protected]>
Tue, 23 Mar 2010 08:18:25 +0000 (08:18 +0000)

Trivial merge