2d7f44540
parent 81065518eda14ebbce1b48c98d5077b0a059d4a3
author Russell King <rmk+kernel@arm.linux.org.uk> 1258909866 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1258909866 +0000

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