tree abfe2a3c84e4987f71ea9b71a0bc771c2c7f2a50
parent 440e2e4759805437f89f7eda78de72cb46729d04
parent 9f1ee150fc7039eb65039ab17d9a95dfa6250133
author Russell King <rmk+kernel@arm.linux.org.uk> 1292197539 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1292197539 +0000

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