Russell King 7b9dd47136 Merge branch 'restart' into for-linus ...

Conflicts:
	arch/arm/mach-exynos/cpu.c

The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.

2012-01-05 13:25:27 +00:00

..

include/mach

Merge branch 'restart' into for-linus

2012-01-05 13:25:27 +00:00

am200epd.c

ARM: pxa/am200epd: fix leak in am200_init_gpio_regs error path

2011-03-17 18:16:12 +08:00

am300epd.c

ARM: pxa/am300epd: fix leak in am300_init_gpio_regs error path

2011-03-17 23:06:29 +08:00

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

ARM / PXA: Use struct syscore_ops for "core" power management

2011-04-24 19:16:09 +02:00

clock-pxa3xx.c

ARM / PXA: Use struct syscore_ops for "core" power management

2011-04-24 19:16:09 +02:00

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

[ARM] 5280/1: pxa: prepare cm-x2xx.c and cm-x2xx-pci.[ch] for addition of CM-X255

2008-10-07 12:05:05 +01:00

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

ARM / PXA: Use struct syscore_ops for "core" power management

2011-04-24 19:16:09 +02:00

cm-x300.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

colibri-evalboard.c

ARM / PXA: Use struct syscore_ops for "core" power management

2011-04-24 19:16:09 +02:00

colibri-pxa3xx.c

mtd: pxa3xx_nand: enable multiple chip select support

2011-09-11 15:02:15 +03:00

colibri-pxa270-income.c

ARM / PXA: Use struct syscore_ops for "core" power management

2011-04-24 19:16:09 +02:00

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_pm.c

[ARM] pxa: removed mostly unused and confusing two sharpsl.h

2010-08-05 14:32:38 +08:00

corgi.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

cpufreq-pxa2xx.c

ARM: pxa: Access SMEMC via virtual addresses

2010-12-16 14:31:16 +08:00

cpufreq-pxa3xx.c

ARM: pxa: reduce the scope of get_clk_frequency_khz()

2010-10-09 17:07:30 +08:00

csb701.c

[ARM] pxa/csb701: do not register devices on non-csb726 boads

2009-04-04 10:26:35 +08:00

csb726.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

devices.c

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable

2011-03-26 10:03:03 +00:00

devices.h

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

2010-10-25 08:32:05 -07:00

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

[ARM] pxa: introduce pxa{25x,27x,300,320,930}.h for board usage

2009-03-09 21:22:36 +08:00

leds-lubbock.c

[ARM] pxa: introduce pxa{25x,27x,300,320,930}.h for board usage

2009-03-09 21:22:36 +08:00

leds-mainstone.c

[ARM] pxa: introduce pxa{25x,27x,300,320,930}.h for board usage

2009-03-09 21:22:36 +08:00

leds.c

[ARM] 5251/1: remove old LED support for Trizeps4 SOM

2008-10-01 22:34:34 +01:00

leds.h

fix file specification in comments

2006-10-03 23:01:26 +02:00

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

ARM / PXA: Use struct syscore_ops for "core" power management

2011-04-24 19:16:09 +02:00

mioa701_bootresume.S

[ARM] pxa/MioA701: fix memory corruption.

2008-11-22 20:57:21 +08:00

mioa701.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

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

[ARM] pxa: add gpio_pwdown(_inverted) into pxaficp_ir.c

2009-09-10 18:49:39 +08:00

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

ARM: Consolidate clks_register() and similar

2010-02-12 17:32:36 +00:00

pxa320.c

ARM: Consolidate clks_register() and similar

2010-02-12 17:32:36 +00:00

pxa930.c

ARM: pxa: support pxa95x

2010-12-18 21:02:14 +08:00

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

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2011-01-13 10:05:56 -08:00

sleep.S

ARM: pm: pxa: move cpu_suspend into C code

2011-06-24 08:48:45 +01:00

smemc.c

ARM / PXA: Use struct syscore_ops for "core" power management

2011-04-24 19:16:09 +02:00

spitz_pm.c

gpio: include linux/gpio.h where needed

2011-06-16 08:40:44 -06:00

spitz.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

standby.S

[ARM] pxa: separate definitions from pxa-regs.h and remove it finally

2009-03-09 21:22:40 +08:00

stargate2.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

tavorevb.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

ARM: pxa/tosa: drop setting LED trigger name, as it's unsupported now

2011-02-27 21:38:18 +08:00

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_pxa300.c

ARM: pxa2xx: reorganize I2C files

2011-03-21 09:09:33 +00:00

zylonite_pxa320.c

[ARM] pxa/zylonite: simplify reduntant gpio settings on mmc slot

2009-12-29 14:11:34 +08:00

zylonite.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00