tree 91ceea4d8fae61b29e9a716c5e6ad56c3b5f588b
parent 573f8c8d13377ec03c2d23269f8eea50c11a7432
parent b28748fb5d21d5d64c9ce31579ffbbd41f317042
author Russell King <rmk+kernel@arm.linux.org.uk> 1361370958 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1361370958 +0000

Merge branch 'misc' into for-linus

Conflicts:
	arch/arm/include/asm/memory.h