| author | Praneeth Bajjuri <praneeth@ti.com> | |
| Tue, 9 Apr 2013 19:34:21 +0000 (14:34 -0500) | ||
| committer | Praneeth Bajjuri <praneeth@ti.com> | |
| Tue, 9 Apr 2013 19:34:21 +0000 (14:34 -0500) | ||
| commit | 847d48731824f95ae1f2591f20c96703cc0149a9 | |
| tree | 00f971123a2fcd6f8574d437a2ab16bc9addd086 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 9207a84be6b2c663c476d2eacb74136e588758be | commit | diff |
| parent | 3742ade312e1a0b54282384393a5d34aa330bdd8 | commit | diff |
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:
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>
* 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>