Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 6 May 2010 07:16:34 +0000 (08:16 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 6 May 2010 07:16:34 +0000 (08:16 +0100)
commit257dab81413b31b8648becfe11586b3a41e5c29a
tree6f407983f0a37dd250d0014b990bbf118df57e34
parentea056df7965fc46cfff28fd3808bf3ada23d5059
parentccb8d8d070b8f25f0163da5c9ceacf63a5169540
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6