Merge branch 'rmobile/urgent' into rmobile-latest
authorPaul Mundt <lethal@linux-sh.org>
Mon, 20 Dec 2010 15:40:51 +0000 (00:40 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 20 Dec 2010 15:40:51 +0000 (00:40 +0900)
commit8bcee1832d23869c2cdb6886ae5210b0143256f0
tree9fac190248ed9ed10fe4e6f7b1b4cda8eaef7ddd
parent5ce2a2ddb5d75d5e2371e58011fc21351bf278cb
parent1cf215a5b43950d1a304373037828158057ff9fc
Merge branch 'rmobile/urgent' into rmobile-latest

Conflicts:
arch/arm/mach-shmobile/include/mach/entry-macro.S

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/arm/Kconfig
arch/arm/mach-shmobile/include/mach/entry-macro-intc.S