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>
Sat, 2 Jan 2010 11:16:20 +0000 (11:16 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 2 Jan 2010 11:16:20 +0000 (11:16 +0000)
commit1df4bb4af42459a4a10e7b21794a6f44463534e6
treedcea2c5f7035a5fc2304b25614d7fa12fe073c58
parentcd6e125c58ae1561bedb6ea6f70b00d6c2599d62
parent91a86a964f0773fdf466fe02577c8494ca8e2083
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6