tree 0694a5c1119368b3bca4c17c5bc3a14a5bfa77e8
parent a133e775d533c0035af627693dec288f1b1d4ffc
parent fc76132b1e72efe45b5a5a693caadd54c3037f55
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1240951261 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1240951261 +0100

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6