]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'next/cleanup' and 'next/dt' into for-next
authorOlof Johansson <olof@lixom.net>
Thu, 12 Dec 2013 01:34:33 +0000 (17:34 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 12 Dec 2013 01:34:47 +0000 (17:34 -0800)
commit74787d3db4580713c79bd6d03942fd33606926cc
treecf5d9c0841e155961ccb9f910b2186c85f4d2cdd
parentd6db2fee1ea7be33fd644170358bce02f60e0bd8
parentb9f10a10cd56414659724bfb9f8b65499f07d538
parente7b4a8dfc82fb07d7db48d6e84e36451a7c73c5c
Merge branches 'next/cleanup' and 'next/dt' into for-next

* next/cleanup:
  ARM: mmp: build sram driver alone
  ARM: pxa: Remove unused variables
  ARM: pxa: remove IRQF_DISABLED

* next/dt:
  ARM: pxa: add PWM nodes to pxa27x.dtsi

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/arm-soc-for-next-contents.txt
arch/arm/mach-pxa/time.c