renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 07:04:00 +08:00
Code
2c8e992716
linux-next/arch/arm/mach-ep93xx
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/mach Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2010-08-07 17:07:31 -07:00
adssphere.c ARM: 6168/1: ep93xx: move physmap flash registration into core.c 2010-06-16 22:56:05 +01:00
clock.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2010-08-07 17:07:31 -07:00
core.c Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
dma-m2p.c ARM: 5876/1: ep93xx: use pr_fmt in dma-m2p.c 2010-01-12 12:38:32 +00:00
edb93xx.c ARM: 6168/1: ep93xx: move physmap flash registration into core.c 2010-06-16 22:56:05 +01:00
gesbc9312.c ARM: 6168/1: ep93xx: move physmap flash registration into core.c 2010-06-16 22:56:05 +01:00
gpio.c ARM: 6029/1: ep93xx: gpio.c: local functions should be static 2010-04-07 21:11:28 +01:00
Kconfig ARM: 5937/1: Add support for EP9315 based Snapper CL15 board 2010-02-15 19:40:50 +00:00
Makefile ARM: 5937/1: Add support for EP9315 based Snapper CL15 board 2010-02-15 19:40:50 +00:00
Makefile.boot ARM: 5744/1: ep93xx: add remaining phys offset selections 2009-10-07 13:11:56 +01:00
micro9.c ARM: 6168/1: ep93xx: move physmap flash registration into core.c 2010-06-16 22:56:05 +01:00
simone.c ARM: 6168/1: ep93xx: move physmap flash registration into core.c 2010-06-16 22:56:05 +01:00
snappercl15.c ASoC: EP93xx: Add Snapper CL15 i2s audio support 2010-06-09 11:16:18 +01:00
ts72xx.c ARM: 6168/1: ep93xx: move physmap flash registration into core.c 2010-06-16 22:56:05 +01:00