Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 4 Jun 2009 16:02:58 +0000 (17:02 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 4 Jun 2009 16:02:58 +0000 (17:02 +0100)
commit754c0f9a95b685163cfa9ea3ba9bd48310f9b06f
tree2375cb28346eda9d347635b862971521dcb17594
parent947ca2e983c7f46b49dbfb5bf51d39941d39f000
parent1257629b0712a0a68a24c532a05a4cd23e3f7565
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6