p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/arch/arm/plat-mxc
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
..
devices imx: dynamically register flexcan devices for mx25 and mx35 2010-07-26 15:05:29 +02:00
include/mach ARM: 6280/1: imx: Fix build failure when including <mach/gpio.h> without <linux/spinlock.h> 2010-08-10 22:10:50 +01:00
3ds_debugboard.c mxc: add common debug board for 3-stack platforms 2010-07-26 14:29:19 +02:00
Kconfig mxc: add common debug board for 3-stack platforms 2010-07-26 14:29:19 +02:00
Makefile mxc: add common debug board for 3-stack platforms 2010-07-26 14:29:19 +02:00
audmux-v1.c ARM: mxc: remove paragraphs with old address of the FSF 2010-06-30 09:00:28 +02:00
audmux-v2.c Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
clock.c arm: mxc: utilise usecount field in clock operations 2010-07-26 14:17:57 +02:00
cpu.c [ARM] MXC: add cpu_is_ macros 2009-03-13 10:34:26 +01:00
devices.c ARM: imx: new helper function imx_add_platform_device 2010-06-30 09:00:03 +02:00
ehci.c Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 into HEAD 2010-07-26 14:27:25 +02:00
gpio.c arm/imx/gpio: add spinlock protection 2010-07-28 09:22:51 +02:00
iomux-v1.c arm/imx/iomux-v1: check for invalid modes in mxc_gpio_mode 2010-02-24 10:07:16 +01:00
iomux-v3.c mxc: iomux v3: remove resource handling 2009-11-24 08:39:43 +01:00
irq.c ARM: imx: get rid of mxc_gpio_init 2010-06-24 15:40:40 +02:00
pwm.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
ssi-fiq-ksym.c ASoC: Add a new imx-ssi sound driver 2010-01-17 11:09:46 +00:00
ssi-fiq.S ASoC: Add a new imx-ssi sound driver 2010-01-17 11:09:46 +00:00
system.c ARM: mxc: remove paragraphs with old address of the FSF 2010-06-30 09:00:28 +02:00
time.c arm/plat-mxc: Fix forgotten renaming in timer.c 2010-04-23 09:22:30 +02:00
tzic.c ARM: imx: get rid of mxc_gpio_init 2010-06-24 15:40:40 +02:00
ulpi.c MXC: Add support for ULPI Viewports 2009-11-14 10:29:15 +01:00