]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commitdiff
Merge branch 'platform-base-3.8.y' into ti-linux-3.8.y
authorDan Murphy <dmurphy@ti.com>
Tue, 5 Mar 2013 15:02:54 +0000 (09:02 -0600)
committerDan Murphy <dmurphy@ti.com>
Tue, 5 Mar 2013 15:02:54 +0000 (09:02 -0600)
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>

Trivial merge