diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-11 02:32:04 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-11 02:32:04 -0400 |
| commit | 5056c073d1a4cfcbbf3bb224f3bc04090fe54aec (patch) | |
| tree | 35aa0c30edce763bea5479f68c0365d35a668575 /kernel/tracepoint.c | |
| parent | 812655e9c199c13cad206b40237463f861e3c5a6 (diff) | |
| parent | bb6abcf440c4c861a2131c0651b683dbd2edba84 (diff) | |
Merge tag 'omap-cleanup-renames-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup2
Simplify some SoC config options before things get too unreadable.
Note that this depends on a fix in omap-fixes-non-critical-for-v3.5,
so it's based on that.
By Kevin Hilman (3) and others
via Tony Lindgren
* tag 'omap-cleanup-renames-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX
ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX
ARM: OMAP: igep0020: Specify the VPLL2 regulator unconditionally
ARM: OMAP2+: INTC: fix Kconfig option for TI81XX
ARM: OMAP2+: remove incorrect irq_chip ack field
ARM: OMAP4: Adding ID for OMAP4460 ES1.1
ARM: OMAP4: panda: add statics to remove warnings
ARM: OMAP2+: Incorrect Register Offsets in OMAP Mailbox
ARM: OMAP: fix trivial warnings for dspbridge
ARM: OMAP4: hsmmc: check for null pointer
ARM: OMAP1: fix compilation issue in board-sx1.c
Diffstat (limited to 'kernel/tracepoint.c')
0 files changed, 0 insertions, 0 deletions