Merge branch 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel...

TI-Feature: platform_base
TI-Tree: git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree
TI-Branch: platform-base-3.8.y

* 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  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

Conflicts:
	arch/arm/boot/dts/omap5-uevm.dts

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

diff --cc arch/arm/boot/dts/omap5-uevm.dts
index 3d12a7a2b69c18ed34b0a2513facb313665c62ba,73b541246cec5adc428985f3a6db8fdfceb34855..109e61605c3b94252dff398a30d4b57d81ae7c63
--- 1/arch/arm/boot/dts/omap5-uevm.dts
--- 2/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@@ -240,35 -106,6 +240,15 @@@
        status = "disabled";
  };
  
- &i2c2 {
-       clock-frequency = <400000>;
- 
-       /* Pressure Sensor */
-       bmp085@77 {
-               compatible = "bosch,bmp085";
-               reg = <0x77>;
-       };
- };
- 
- &i2c4 {
-       clock-frequency = <400000>;
- 
-       /* Temperature Sensor */
-       tmp102@48{
-               compatible = "ti,tmp102";
-               reg = <0x48>;
-       };
- };
- 
 +&i2c5 {
 +      tca6424a: tca6424a@22 {
 +              compatible = "ti,tca6424a";
 +              reg = <0x22>;
 +              gpio-controller;
 +              #gpio-cells = <2>;
 +      };
 +};
 +
  &mcbsp3 {
        status = "disabled";
  };