Merge tag 'omap-for-v3.15/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Sun, 9 Mar 2014 07:02:00 +0000 (23:02 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 9 Mar 2014 07:02:00 +0000 (23:02 -0800)
commitf2f91bee92c4cdec1f66d08600a57262940fe35d
tree419b64e75be2a7472cb1a4b90c23d2604b3ec2e8
parentc381585fcc2426da35a6388fcc72a91ecd4f9add
parent9b91bd81fa40b4765e24721d970c26ae2e1d8b0d
Merge tag 'omap-for-v3.15/soc-signed' of git://git./linux/kernel/git/tmlind/linux-omap into next/soc

OMAP SoC changes from Tony Lindgren:

Few SoC related improvments for omaps.

* tag 'omap-for-v3.15/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: remove OMAP_PACKAGE_ZAC and OMAP_PACKAGE_ZAF
  ARM: OMAP2+: AM43x: Use gptimer as clocksource
  ARM: OMAP2+: AM43x: determine features
  ARM: OMAP2+: AM43x: Add ID for ES1.1
  ARM: OMAP2+: AM43x: enable in default config

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-omap2/Kconfig