]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit24518399cd23e74be85f1b4c8ccf0bde74308980
tree0a84ae436325d6e646fe987516fb6bfccfff8a1c
parent53f3050c4af46764996e9132974da53a556223a4
parent2c9f0748d8e38bbc0b628e1dd311d50d20156538
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