| author | Praneeth Bajjuri <praneeth@ti.com> | |
| Tue, 9 Apr 2013 17:20:14 +0000 (12:20 -0500) | ||
| committer | Praneeth Bajjuri <praneeth@ti.com> | |
| Tue, 9 Apr 2013 17:20:14 +0000 (12:20 -0500) | ||
| commit | 3742ade312e1a0b54282384393a5d34aa330bdd8 | |
| tree | 2c3d4ba2f90334a2b08556140815900e36af099f | tree | snapshot (tar.xz tar.gz zip) |
| parent | 043750cbb1e82aa152b11240cce51e0756dddf5f | commit | diff |
| parent | 848e201218ae8d3adfd2f2e9f3ffedb6cb42dc3c | commit | diff |
Merge branch 'ti-linux-3.8.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel into p-ti-linux-3.8.y
* 'ti-linux-3.8.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel:
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>
* 'ti-linux-3.8.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel:
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>