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>
Tue, 28 Apr 2009 20:41:01 +0000 (21:41 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 28 Apr 2009 20:41:01 +0000 (21:41 +0100)
commit10993374f84cc1c4100aea9eca7fa154518ffc5e
tree0694a5c1119368b3bca4c17c5bc3a14a5bfa77e8
parenta133e775d533c0035af627693dec288f1b1d4ffc
parentfc76132b1e72efe45b5a5a693caadd54c3037f55
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6
arch/arm/Kconfig