tree c0a1568e21c5ce6cd4112e44071040a3e611a9ec
parent 4af8f24d99d119ed68b27d1b0bd6f2ab2b23ed1b
parent b476ef059ec9e49d4f2a4280b862b446ef3866e8
author Russell King <rmk+kernel@arm.linux.org.uk> 1287411621 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1287411621 +0100

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