]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'for-tony-mailbox'
authorTony Lindgren <tony@atomide.com>
Mon, 22 Dec 2008 15:27:47 +0000 (17:27 +0200)
committerTony Lindgren <tony@atomide.com>
Mon, 22 Dec 2008 15:27:47 +0000 (17:27 +0200)
commit76044b05598cd9350738c3e74018a29960e3ca24
treef54fa0eac00a9b29e0b69a06c08f7d503e7ebb32
parent4a374e24009388241649a43b89c97fc5dca15594
parentbf71df90aa368de4fafb1b8d578a3b3ee2dba91a
Merge branch 'for-tony-mailbox'

Conflicts:

arch/arm/plat-omap/Kconfig
arch/arm/plat-omap/include/mach/omap34xx.h
arch/arm/plat-omap/mailbox.c
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap1/mailbox.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/mailbox.c
arch/arm/plat-omap/Kconfig
arch/arm/plat-omap/include/mach/omap34xx.h