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, 28 Jan 2010 21:59:58 +0000 (21:59 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 28 Jan 2010 21:59:58 +0000 (21:59 +0000)
commit0b6c135ea9d563f77fe121deff6f19af222b3b0e
tree3d48d7582c0d10befaa0e440c1c3c756e547edbd
parent00e4acb1e2352477e4d0a19dcbff2af870e8b401
parentc70f5a60994058895384f593989a9fbe6fe6adee
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6