diff options
author | Olof Johansson <olof@lixom.net> | 2014-03-09 08:02:00 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-03-09 08:02:00 +0100 |
commit | f2f91bee92c4cdec1f66d08600a57262940fe35d (patch) | |
tree | 419b64e75be2a7472cb1a4b90c23d2604b3ec2e8 /arch/arm/mach-omap2/omap54xx.h | |
parent | Merge tag 'v3.15-rockchip-smp' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
parent | ARM: OMAP2+: remove OMAP_PACKAGE_ZAC and OMAP_PACKAGE_ZAF (diff) | |
download | linux-f2f91bee92c4cdec1f66d08600a57262940fe35d.tar.xz linux-f2f91bee92c4cdec1f66d08600a57262940fe35d.zip |
Merge tag 'omap-for-v3.15/soc-signed' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'arch/arm/mach-omap2/omap54xx.h')
0 files changed, 0 insertions, 0 deletions