tree a03891a32abe0da191fb765fe669a597e07423c6
parent 90bb28b0644f7324f8bd1feb27b35146e6785ba2
parent 8ec53663d2698076468b3e1edc4e1b418bd54de3
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1223584316 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1223584316 +0100

Merge branch 'ptebits' into devel

Conflicts:

	arch/arm/Kconfig