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, 9 Jul 2009 15:07:22 +0000 (16:07 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 9 Jul 2009 15:07:22 +0000 (16:07 +0100)
commit4e66a0f536ad449a71de75bc81f4a830ef38d538
treef6f7f4d9a351aa9e2fd07bec275785a533d8c21b
parent34f25476ace556263784ea2f8173e22b25557a13
parent22fe84394f405c673b362d23dcc2d5d095ab5f6c
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6