95782
author Russell King <rmk+kernel@arm.linux.org.uk> 1273740984 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1273740984 +0100

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