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)
commitd21872b3683ff37f73c68993749a6e6aeeaed265
tree0a84ae436325d6e646fe987516fb6bfccfff8a1c
parent80690ccc41f01df6edfb6684006824d8edff189e
parentb3e69146f43fa351aa3cdffe2e76ec42174da612
Merge branch 'v2.6.35-omap-mailbox-for-next' of git://gitorious.org/~doyu/lk/mainline into omap-for-linus

Conflicts:
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap2/devices.c
arch/arm/plat-omap/Kconfig