| author | Dan Murphy <dmurphy@ti.com> | |
| Tue, 5 Mar 2013 15:02:54 +0000 (09:02 -0600) | ||
| committer | Dan Murphy <dmurphy@ti.com> | |
| Tue, 5 Mar 2013 15:02:54 +0000 (09:02 -0600) | ||
| commit | d8f4be547001118ff1aaeb1a4a886019052cbbf7 | |
| tree | fc16ab2658fc32a48e2ea036e5591e0dd66ab5c2 | tree | snapshot (tar.xz tar.gz zip) |
| parent | d26595a42220789b81a9d243e2fc0837c7776360 | commit | diff |
| parent | b6aa7fd7256638e0c96afe5ee23b284c1d952835 | commit | diff |
Merge branch 'platform-base-3.8.y' into ti-linux-3.8.y
TI-Feature: platform_base
TI-Tree: http://git.ti.com/git/~rrnayak/ti-linux-kernel/platform-linux-feature-tree
TI-Branch: platform-base-3.8.y
* platform-base-3.8.y:
omap: watchdog: Use Delay Interrupt only if it is supported
omap: watchdog: Enable delay interrupt wakeup capability
arm: omap: cclock54xx: Tie dss clock domain to dss_sys_clk
ARM: LPAE: Fix mapping in alloc_init_section for unaligned addresses
ARM: OMAP5: hwmod: Get rid of 'HWMOD_SWSUP_SIDLE' for mmc4 and sata
Signed-off-by: Dan Murphy <dmurphy@ti.com>
TI-Feature: platform_base
TI-Tree: http://git.ti.com/git/~rrnayak/ti-linux-kernel/platform-linux-feature-tree
TI-Branch: platform-base-3.8.y
* platform-base-3.8.y:
omap: watchdog: Use Delay Interrupt only if it is supported
omap: watchdog: Enable delay interrupt wakeup capability
arm: omap: cclock54xx: Tie dss clock domain to dss_sys_clk
ARM: LPAE: Fix mapping in alloc_init_section for unaligned addresses
ARM: OMAP5: hwmod: Get rid of 'HWMOD_SWSUP_SIDLE' for mmc4 and sata
Signed-off-by: Dan Murphy <dmurphy@ti.com>