1
linux/arch/arm/mach-u300
Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus
Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c
2010-03-08 16:55:37 +01:00
..
include/mach Merge branch 'for-next' into for-linus 2010-03-08 16:55:37 +01:00
clock.c Merge branches 'clks' and 'pnx' into devel 2010-02-25 22:10:38 +00:00
clock.h
core.c Merge branch 'for-next' into for-linus 2010-03-08 16:55:37 +01:00
dummyspichip.c ARM: 5667/3: U300 SSP/SPI board setup and test 2009-08-15 15:36:29 +01:00
gpio.c ARM: 5956/1: misplaced parentheses 2010-02-24 21:10:07 +00:00
i2c.c ARM: 5783/1: Make it possible for U300 LDO D to shut down 2009-11-10 23:47:07 +00:00
i2c.h ARM: 5668/2: U300 I2C board setup 2009-08-15 15:36:29 +01:00
Kconfig ARM: 5667/3: U300 SSP/SPI board setup and test 2009-08-15 15:36:29 +01:00
Makefile ARM: 5724/1: U300 AB3100 boardinfo v5 2009-10-19 17:10:09 +01:00
Makefile.boot
mmc.c ARM: 5725/2: U300 switch MMCI to use regulator 2009-10-19 17:10:09 +01:00
mmc.h
padmux.c ARM: 5666/1: Revamped U300 padmux API 2009-08-15 15:36:28 +01:00
padmux.h ARM: 5666/1: Revamped U300 padmux API 2009-08-15 15:36:28 +01:00
regulator.c ARM: 5724/1: U300 AB3100 boardinfo v5 2009-10-19 17:10:09 +01:00
spi.c ARM: 5678/1: SSP/SPI PL022 polarity terminology fix 2009-09-18 22:09:02 +01:00
spi.h ARM: 5667/3: U300 SSP/SPI board setup and test 2009-08-15 15:36:29 +01:00
timer.c ARM: 5704/1: U300 sched_clock implementation v2 2009-09-18 22:09:02 +01:00
u300.c