Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/arch/arm/plat-omap
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
..
include/plat Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
clock.c OMAP4 clock: Support clk_set_parent 2010-05-20 12:31:12 -06:00
common.c omap3: introduce omap3_map_io 2010-08-04 14:43:18 +03:00
cpu-omap.c OMAP clock/CPUFreq: add clk_exit_cpufreq_table() 2010-01-08 15:23:16 -07:00
debug-devices.c omap: use smc91x_platdata to setup smc91x 2009-12-11 16:16:33 -08:00
debug-leds.c Replacing LEDS_OMAP_DEBUG with OMAP_DEBUG_LEDS 2010-07-05 17:03:58 +03:00
devices.c Removing dead OMAP_DSP 2010-07-05 16:31:54 +03:00
dma.c omap: dma: Support for prefetch in destination synchronizedtransfer 2010-08-02 14:21:40 +03:00
dmtimer.c omap: DMTIMER: Ack pending interrupt always when stopping a timer 2010-06-10 15:37:41 +03:00
fb.c ARM: OMAP: Convert OMAPFB and VRAM SDRAM reservation to LMB 2010-07-27 08:48:23 +01:00
gpio.c omap2: Fix GPIO numbers and smc91x for 2430sdp 2010-08-02 14:21:39 +03:00
i2c.c OMAP: PM constraints: add return values; add requesting device param to omap_pm_set_max_dev_wakeup_lat() 2010-07-26 16:34:34 -06:00
io.c Merge with mainline to remove plat-omap/Kconfig conflict 2010-03-01 14:19:05 -08:00
iommu-debug.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
iommu.c omap iommu: move iommu_disable at fault to the above layer 2010-06-29 07:55:07 +03:00
iopgtable.h omap iommu: Rename iopte_[p,v]addr -> iopte_page_[p,v]addr 2010-06-29 07:55:05 +03:00
iovmm.c omap iommu: Fix Memory leak 2010-06-09 13:21:27 +03:00
Kconfig Merge branch 'v2.6.35-omap-mailbox-for-next' of git://gitorious.org/~doyu/lk/mainline into omap-for-linus 2010-08-04 16:10:38 +03:00
mailbox.c omap: mailbox: reorganize headers 2010-08-04 15:50:20 +03:00
Makefile OMAP4: hwmod: Enable omap_device build for OMAP4 2010-07-26 16:34:30 -06:00
mcbsp.c OMAP3: McBSP: Use the port's buffer_size when calculating tx delay 2010-06-03 16:12:40 +01:00
mux.c omap: mux: Remove old mux code 2010-07-05 16:31:40 +03:00
ocpi.c
omap-pm-noop.c OMAP: PM constraints: add omap_pm_set_min_clk_rate() 2010-07-26 16:34:34 -06:00
omap_device.c omap: device: improve errors handling 2010-08-04 14:43:51 +03:00
sram.c omap4: Fix multiboot with CONFIG_PM and CONFIG_ARCH_OMAP3 selected 2010-05-04 13:19:16 -07:00
usb.c omap: Move omap1 USB platform init code into mach-omap1/usb.c 2010-07-05 16:31:30 +03:00