OSDN Git Service

Merge tag 'keystone-fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel...
authorKevin Hilman <khilman@linaro.org>
Wed, 7 Aug 2013 23:11:29 +0000 (16:11 -0700)
committerKevin Hilman <khilman@linaro.org>
Wed, 7 Aug 2013 23:17:16 +0000 (16:17 -0700)
commit44de76b6306ff6d9012eb00174f3ea7b0a15242f
tree9b73d38eb60a654b4304d706e1d9c5ecfa334622
parent6a33fc8cacfc7fac829c72bd321868be7e72f609
parenteb788f43a6c6e6c7a5b2879543b565e4cd452de8
Merge tag 'keystone-fixes-non-critical' of git://git./linux/kernel/git/ssantosh/linux-keystone into next/fixes-non-critical

From: Santosh Shilimkar <santosh.shilimkar@ti.com>:
ARM: keystone: non-critical fixes, cleanup for 3.12

Summary of changes:
- Drop unused HAVE_SCHED_CLOCK config option
- Remove now redundant smp_init_cpus call
- Update the smc code to remove dsb and r12 usage
- Convert device tree to use #include and GIC bindings

* tag 'keystone-fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: Keystone: Convert device tree file to use IRQ defines
  ARM: keystone: use #include to include skeleton.dtsi
  ARM: keystone: Drop the un-necessary dsb from keystone_cpu_smc()
  ARM: Keystone: No need to preserve r12 across smc call
  ARM: keystone: remove redundant smp_init_cpus definition
  ARM: keystone: drop useless HAVE_SCHED_CLOCK

Signed-off-by: Kevin Hilman <khilman@linaro.org>