tree 2c9971160051cae98237715f791ce2b93a0720b5
parent 4bddaf66093ce0e0c1fce505f091f4cd52e73e2e
parent baffe1699c68da5040de6b274054adc995795782
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