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)
commita32737e1ca650504f172292dd344eb64c02311f3
tree7dd2004ece26081507af877d9dd40b1bd4eecc1a
parent27edacac7d97d37ec77779c7da08345298a5d283
parenta3c2b511a844641f6d0b60bd84cd6076143b3f2d
Merge branches 'fixes' and 'misc' into for-linus
arch/arm/Kconfig
arch/arm/mm/proc-v7.S