| author | Dan Murphy <dmurphy@ti.com> | |
| Tue, 9 Apr 2013 14:42:18 +0000 (09:42 -0500) | ||
| committer | Dan Murphy <dmurphy@ti.com> | |
| Tue, 9 Apr 2013 14:42:18 +0000 (09:42 -0500) | ||
| commit | 46597334f4480681a60bec112ca3f366a8120545 | |
| tree | 373a903908763a52676747d3692ad502988fa21c | tree | snapshot (tar.xz tar.gz zip) |
| parent | 9b16b2d9955ef0bff13cd4bcd75dd2b841ae7302 | commit | diff |
| parent | d2c63ff9e0ca277a6da44ff475365dadca215c1a | commit | diff |
Merge branch 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-3.8.y
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>
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>
| arch/arm/boot/dts/omap5-uevm.dts | diff1 | | diff2 | | blob | history |