]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb25e8979bd948d1627b9e95fb7d64c09a64a86de
tree91ceea4d8fae61b29e9a716c5e6ad56c3b5f588b
parent7f548aa87c3e87824e59db188308a1107a12f1f1
parent8ce8e36e7b8494537739af70a469e9e0b950d943
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