]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'misc' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 18 Feb 2013 22:05:28 +0000 (22:05 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 18 Feb 2013 22:05:28 +0000 (22:05 +0000)
commitba2f6683e79904e21c94d985ae8a3b8ad2db33f7
tree3b87a95a0a9bac69b50aaffe780891e5c5a50591
parentf741656d646f7a5b56ba86765205b954237e7956
parentb28748fb5d21d5d64c9ce31579ffbbd41f317042
Merge branch 'misc' into for-next

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