Merge branch 'mailbox-linux-3.8.y' into ti-linux-3.8.y

TI-Feature: mailbox_ipc_base
TI-Tree: git://gitorious.ti.com/rpmsg/mailbox
TI-Branch: mailbox-linux-3.8.y

* mailbox-linux-3.8.y:
  mailbox/omap: add an API for emptying the Tx FIFO
  ARM: OMAP2+: AM33XX: add support for mailbox used for WKUP_M3
  mailbox: call request_irq after mbox queues are allocated
  mailbox: check for NULL nb in mailbox_put
  mailbox/omap: check iomem resource before dereferencing it
  mailbox: create dbx500 mailbox driver
  mailbox: add no_irq send message
  mailbox: add IRQF_NO_SUSPEND flag
  mailbox: add shared memory mailbox type
  mailbox: change protection mechanisms
  mailbox: create opened message type
  mailbox: rename omap_mbox in mailbox
  mailbox: split internal header from API header
  mailbox: OMAP: introduce mailbox framework
  ARM: OMAP2+: mbox: remove dependencies with soc.h

Conflicts:
	arch/arm/mach-omap2/devices.c

Signed-off-by: Dan Murphy <dmurphy@ti.com>

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

diff --cc arch/arm/mach-omap2/devices.c
index 26bedba2d9806822a14cd5287183cf96114ec5bf,971dfebbf2caebef5639cf10c316cebdd674ac64..d1aebccd71c43fd0e7a8989e2e3cf8f376d90636
--- 1/arch/arm/mach-omap2/devices.c
--- 2/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -20,7 -20,7 +20,8 @@@
  #include <linux/pinctrl/machine.h>
  #include <linux/platform_data/omap4-keypad.h>
  #include <linux/platform_data/omap_ocp2scp.h>
 +#include <linux/usb/omap_control_usb.h>
+ #include <linux/platform_data/mailbox-omap.h>
  
  #include <asm/mach-types.h>
  #include <asm/mach/map.h>

diff --cc arch/arm/mach-omap2/omap_hwmod_33xx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Simple merge

diff --cc arch/arm/plat-omap/Kconfig
Simple merge