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>
Mon, 20 Apr 2009 13:03:04 +0000 (14:03 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 20 Apr 2009 13:03:04 +0000 (14:03 +0100)
commit64bd43a086469a0bfdd87e012523184bdd96ce81
treef44ff7df4bae5ac265f68885663a790885895666
parent4a014a240b5a3c3b167702948a22dbe9e9a150a8
parenta48dc30da44769ea3f3562c18f54878a9a3e78a1
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6