Merge branches 'fixes' and 'misc' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Jan 2012 13:24:16 +0000 (13:24 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Jan 2012 13:24:16 +0000 (13:24 +0000)
1  2 
arch/arm/Kconfig
arch/arm/mm/proc-v7.S

Simple merge
Simple merge