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, 1 Jul 2010 09:16:00 +0000 (10:16 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 1 Jul 2010 09:16:04 +0000 (10:16 +0100)
commitfb35f1ce6bc8c2301f918a7fb6d7dd8e0bfee8c5
tree1d3f38534ab1ac7672d0c33e5c7328f4f2c07f6b
parent8954bb0da99b76c7ce5edf2f314807cff68b6ea8
parentcdb4acc0568f4f6e10e778f0c2cd04fcd4786c09
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6