summaryrefslogtreecommitdiff
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-10-26 17:54:14 +0400
committerArnd Bergmann <arnd@arndb.de>2012-10-26 17:54:14 +0400
commit148a8698763130c96004ef419b5f0d44a93d413c (patch)
tree48a3ea5484e3fc9e485d7bb1b0e3d8795c67d368 /kernel/timer.c
parentddffeb8c4d0331609ef2581d84de4d763607bd37 (diff)
parente4c060db2c13f10de09101afc564763f9fd0019a (diff)
downloadlinux-148a8698763130c96004ef419b5f0d44a93d413c.tar.xz
Merge tag 'omap-for-v3.8/cleanup-headers-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/headers
From Tony Lindgren <tony@atomide.com>: This is the first set of omap cleanup patches for v3.8 merge window to remove most of the remaining plat includes to get us closer to ARM common zImage support. To avoid a huge amount of trivial merge conflicts with includes, this branch is based on several small topic branches coordinated with the driver subsystem maintainers. These branches are based on v3.7-rc1 and can also be merged into the related driver subsystem branches as needed: omap-for-v3.8/cleanup-headers-prepare few trivial driver changes omap-for-v3.8/cleanup-headers-dma move of the DMA header omap-for-v3.8/cleanup-headers-gpmc GPMC and MTD changes omap-for-v3.8/cleanup-headers-mmc MMC related changes omap-for-v3.8/cleanup-headers-dss DSS related changes omap-for-v3.8/cleanup-headers-asoc ASoC related changes Note that for the dma-omap.h, it was decided that it should be is completed. For the related discussion, please see: https://patchwork.kernel.org/patch/1519591/# After these patches we still have a few plat headers remaining that will be handled in later pull requests. * tag 'omap-for-v3.8/cleanup-headers-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (58 commits) ARM: OMAP: Split plat/cpu.h into local soc.h for mach-omap1 and mach-omap2 ARM: OMAP: clock: split plat/clkdev_omap.h into OMAP1/2 files ARM: OMAP: remove plat/clock.h ARM: OMAP: duplicate plat-omap/clock.c into mach-omap[12]/clock.c ARM: OMAP: Move plat/omap-secure.h locally to mach-omap2 ARM: OMAP2+: Move omap_reserve() locally to mach-omap2 ARM: OMAP1: Remove omap_reserve() callback for all omap1 boards ARM: OMAP: Make plat/omap-pm.h local to mach-omap2 ARM: OMAP: Merge plat/multi.h into plat/cpu.h ARM: OMAP: Make plat/omap_hwmod.h local to mach-omap2 ARM: OMAP: Make omap_device local to mach-omap2 ARM: OMAP: Make plat/sram.h local to plat-omap ARM: OMAP: Move plat/led.h to include/linux/platform_data ARM: OMAP: Make plat/common.h local to mach-omap1 and mach-omap2 ARM: OMAP: Split plat-omap/i2c.c into mach-omap1 and mach-omap2 ARM: OMAP2+: Make board-zoom.h local ARM: OMAP1: Move plat/tc.h to mach/tc.h for omap1 ARM: OMAP: Make plat/fpga.h local to arch/arm/plat-omap ARM: OMAP: move plat-omap/include/plat/sdrc.h into mach-omap2/sdrc.h OMAPFB: use omap_vrfb_supported() ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'kernel/timer.c')
0 files changed, 0 insertions, 0 deletions