Merge remote-tracking branch 'origin/p-ti-linux-3.8.y' into p-ti-android-3.8.y
authorPraneeth Bajjuri <praneeth@ti.com>
Tue, 9 Apr 2013 19:34:21 +0000 (14:34 -0500)
committerPraneeth Bajjuri <praneeth@ti.com>
Tue, 9 Apr 2013 19:34:21 +0000 (14:34 -0500)
* origin/p-ti-linux-3.8.y:
  arm: dts: omap5-uevm: Add uart pinctrl data
  omap: watchdog: If enabled stop watchdog during module removal
  omap: watchdog: Use devm_request_irq instead of request_irq()
  ARM: dts: omap5-uevm: Remove tmp102 dt entry
  ARM: dts: omap5-uevm: Remove bmp085 dt entry
  drivers: net: cpsw: build warning as cpts is pointer

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

Trivial merge