Merge branch 'v2.6.35-omap-mailbox-for-next' of git://gitorious.org/~doyu/lk/mainline...
authorTony Lindgren <tony@atomide.com>
Wed, 4 Aug 2010 13:10:38 +0000 (16:10 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 4 Aug 2010 13:10:38 +0000 (16:10 +0300)
Conflicts:
arch/arm/mach-omap1/devices.c

1  2 
arch/arm/mach-omap2/devices.c
arch/arm/plat-omap/Kconfig

Simple merge
Simple merge