Merge branch 'misc' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 20 Feb 2013 14:35:58 +0000 (14:35 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 20 Feb 2013 14:35:58 +0000 (14:35 +0000)
commit1b1c7409b75a8b62906b78b84c8469002072b738
tree91ceea4d8fae61b29e9a716c5e6ad56c3b5f588b
parent573f8c8d13377ec03c2d23269f8eea50c11a7432
parentb28748fb5d21d5d64c9ce31579ffbbd41f317042
Merge branch 'misc' into for-linus

Conflicts:
arch/arm/include/asm/memory.h
MAINTAINERS
arch/arm/include/asm/memory.h
arch/arm/mm/mmu.c