Merge branch 'iomap' into cleanup
authorTony Lindgren <tony@atomide.com>
Tue, 28 Feb 2012 22:27:01 +0000 (14:27 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 28 Feb 2012 22:27:01 +0000 (14:27 -0800)
commita5bee307ba7befc96a97915d6d45ffbe1e5f9a20
tree544713c8b4359221df3677fb93a52892c57fbcee
parent0aac881246fb25d017617cd7be68e93326d51ce1
parentacea7c7b81e8f67513aebade8cb99c7789c44d8c
Merge branch 'iomap' into cleanup
arch/arm/mach-omap1/include/mach/entry-macro.S
arch/arm/mach-omap1/pm.c
arch/arm/mach-omap2/emu.c
arch/arm/mach-omap2/pm24xx.c