Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/arch/arm/mach-pxa
History
Arnd Bergmann 421b759b86 Merge branch 'samsung/cleanup' into next/boards 
Conflicts:
	arch/arm/mach-imx/mach-imx6q.c
	arch/arm/mach-omap2/board-ti8168evm.c
	arch/arm/mach-s3c64xx/Kconfig
	arch/arm/mach-tegra/Makefile
	arch/arm/mach-tegra/board-dt-tegra20.c
	arch/arm/mach-tegra/common.c

Lots of relatively simple conflicts between the board
changes and stuff from the arm tree. This pulls in
the resolution from the samsung/cleanup tree, so we
don't get conflicting merges.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-09 17:06:36 +00:00
..
include/mach Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
am200epd.c
am300epd.c
balloon3.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
capc7117.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
clock-pxa2xx.c
clock-pxa3xx.c
clock.c ARM: pxa: add clk_set_rate() 2011-07-12 19:45:19 +08:00
clock.h ARM: pxa: add clk_set_rate() 2011-07-12 19:45:19 +08:00
cm-x2xx-pci.c ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
cm-x2xx-pci.h
cm-x2xx.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
cm-x255.c ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
cm-x270.c
cm-x300.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
colibri-evalboard.c
colibri-pxa3xx.c mtd: pxa3xx_nand: enable multiple chip select support 2011-09-11 15:02:15 +03:00
colibri-pxa270-income.c
colibri-pxa270.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
colibri-pxa300.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
colibri-pxa320.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
corgi.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
corgi_pm.c
cpufreq-pxa2xx.c
cpufreq-pxa3xx.c
csb701.c
csb726.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
devices.c
devices.h
em-x270.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
eseries.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
eseries.h ARM: PXA: eseries: fix eseries_register_clks section mismatch warning 2011-11-05 19:09:42 +00:00
ezx.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
generic.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
generic.h ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
gumstix.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
h5000.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
himalaya.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
hx4700.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
icontrol.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
idp.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
irq.c Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 19:55:06 -07:00
Kconfig ARM: pxa: sharpsl pm needs SPI 2011-10-08 21:03:06 +08:00
leds-idp.c
leds-lubbock.c
leds-mainstone.c
leds.c
leds.h
littleton.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
lpd270.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
lubbock.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
magician.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
mainstone.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
Makefile ARM: pxa: pxa95x/saarb depends on pxa3xx code 2011-10-08 21:03:00 +08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mfp-pxa2xx.c ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
mfp-pxa3xx.c
mioa701.c Merge branch 'samsung/cleanup' into next/boards 2012-01-09 17:06:36 +00:00
mioa701_bootresume.S
mp900.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
mxm8x10.c mtd: pxa3xx_nand: enable multiple chip select support 2011-09-11 15:02:15 +03:00
palm27x.c ARM: pxa: fix inconsistent CONFIG_USB_PXA27X 2011-11-10 15:32:27 +08:00
palmld.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
palmt5.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
palmtc.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
palmte2.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
palmtreo.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
palmtx.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
palmz72.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
pcm027.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
pcm990-baseboard.c [media] ARM: PXA: use gpio_set_value_cansleep() on pcm990 2011-11-03 18:27:41 -02:00
pm.c ARM: pm: move cpu_init() call into core code 2011-06-24 08:48:43 +01:00
poodle.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
pxa2xx.c
pxa3xx-ulpi.c ARM: pxa: export symbols from pxa3xx-ulpi 2011-10-08 21:02:58 +08:00
pxa3xx.c Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
pxa25x.c Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
pxa27x.c Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
pxa95x.c ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
pxa300.c
pxa320.c
pxa930.c
raumfeld.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
reset.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
saar.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
saarb.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
sharpsl_pm.c
sleep.S ARM: pm: pxa: move cpu_suspend into C code 2011-06-24 08:48:45 +01:00
smemc.c
spitz.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
spitz_pm.c gpio: include linux/gpio.h where needed 2011-06-16 08:40:44 -06:00
standby.S
stargate2.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
tavorevb.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
tavorevb3.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
time.c ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime 2011-12-18 23:00:26 +00:00
tosa-bt.c
tosa.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
trizeps4.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
viper.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
vpac270.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
xcep.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
z2.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
zeus.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
zylonite.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
zylonite_pxa300.c
zylonite_pxa320.c