Merge remote-tracking branch 'origin/p-ti-linux-3.8.y' into p-ti-android-3.8.y

* origin/p-ti-linux-3.8.y: (114 commits)
  drm.h: Fix DRM compilation with bare-metal toolchain
  Revert "ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module"
  mmc:fix max discard sectors limit
  arm: configs: disable unused sata configs
  ARM: dts: omap3-beagle-xm: Add USB Host support
  dmaengine: OMAP: Register SDMA controller with Device Tree DMA driver
  ARM: OMAP3: Beagle: Fix USB Host on beagle xM Ax/Bx
  USB: ehci-omap: Fix stale dma_mask on repeated modprobe/rmmod
  ARM: omap2plus_defconfig: Enable USB Video class drivers
  usb: dwc3: set 'mode' based on selected Kconfig choices
  usb: dwc3: remove dwc3 dependency on host AND gadget.
  drivers: usb: otg: palmas: enable VBUS on ID connect interrupt
  drivers: regulator: palmas: add an API to set/clear the switch bit on SMPS10
  usb: dwc3: gadget: free trb pool only from epnum 2
  ARM: OMAP: Display: Fix compile issues
  ARM: DTS: OMAP5-uevm: pull-up Palmas MSECURE line
  ARM/dts: omap5-sevm: Enable palmas on i2c1 bus
  ARM: OMAP2+: omap2plus_defconfig: Enable RTC support
  ARM: dts: AM33XX: Enable system power off control in am335x-bone
  ARM: dts: AM33XX: Set pmic-shutdown-controller for BeagleBone
  ...

Conflicts:
	drivers/hid/hid-magicmouse.c

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

diff --cc drivers/hid/hid-magicmouse.c
Simple merge