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>
Wed, 15 Apr 2009 08:58:21 +0000 (09:58 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 15 Apr 2009 08:58:21 +0000 (09:58 +0100)
commit9fa264d0d327a67db4913b400bcfb174d929054c
treeec2ba2b7d6d9c32e7bdb2d2aa8c61bfe48546664
parent0882e8dd3aad33eca41696d463bb896e6c8817eb
parent6845a658e09767e72c12558825ed66a9eda02737
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6