Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 18:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
2c8e992716
linux/arch/arm/mach-omap2/include/mach
History
Mark Brown e4862f2f6f Merge branch 'for-2.6.36' into for-2.6.37 
Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
	arch/arm/mach-mx2/clock_imx27.c
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-zoom2.c
	sound/soc/fsl/mpc5200_dma.c
	sound/soc/fsl/mpc5200_dma.h
	sound/soc/fsl/mpc8610_hpcd.c
	sound/soc/pxa/spitz.c
2010-08-16 18:42:58 +01:00
..
am35xx.h AM35xx EMAC: define submodule offsets 2010-05-20 10:53:55 -07:00
board-flash.h omap3 flash: rename board-sdp-flash.c to be use by other boards 2010-08-02 15:43:29 +03:00
board-zoom.h Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
clkdev.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
debug-macro.S omap: Fix DEBUG_LL uart to access phys addr when MMU isn't enable 2010-08-04 12:17:53 +03:00
entry-macro.S omap2: Fix ARM processor check for 24xx 2010-04-23 15:35:11 -07:00
gpio.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
hardware.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
id.h omap: Add new interface omap_get_die_id 2010-08-02 14:21:41 +03:00
io.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
irqs.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
memory.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
omap4-common.h omap4: hotplug: Add basic CPU hotplug support 2010-08-02 13:18:19 +03:00
smp.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
system.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
timex.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
uncompress.h omap: headers: Create headers necessary for compile under mach-omap1 and mach-omap2 2009-10-19 17:32:58 -07:00
vmalloc.h omap: Split vmalloc.h for mach-omap1 and mach-omap2 2009-10-19 17:26:29 -07:00