Linus Torvalds 3960ef326a Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc ...

* 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
  ARM: Consolidate the clkdev header files
  ARM: set vga memory base at run-time
  ARM: convert PCI defines to variables
  ARM: pci: make pcibios_assign_all_busses use pci_has_flag
  ARM: remove unnecessary mach/hardware.h includes
  pci: move microblaze and powerpc pci flag functions into asm-generic
  powerpc: rename ppc_pci_*_flags to pci_*_flags

Fix up conflicts in arch/microblaze/include/asm/pci-bridge.h

2011-07-26 17:12:10 -07:00

..

include/mach

Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

2011-07-26 17:12:10 -07: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 / PXA: Use struct syscore_ops for "core" power management

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

capc7117.c

…

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

…

clock.h

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

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

cm-x2xx-pci.c

ARM: convert PCI defines to variables

2011-07-12 11:19:29 -05:00

cm-x2xx-pci.h

…

cm-x2xx.c

ARM: mach-pxa: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size

2011-07-18 15:30:01 -04:00

cm-x255.c

…

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: pxa/cm-x300: minor style cleanup

2011-07-11 14:43:27 +08: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

ARM: pxa: clean up set_pxa_fb_info

2011-03-16 16:32:47 +08: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 / PXA: Use struct syscore_ops for "core" power management

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

colibri-pxa300.c

…

colibri-pxa320.c

…

corgi_pm.c

…

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

cpufreq-pxa2xx.c

…

cpufreq-pxa3xx.c

…

csb701.c

…

csb726.c

ARM: pxa2xx: reorganize I2C files

2011-03-21 09:09:33 +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

…

em-x270.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

eseries.c

ARM: pxa/eseries: switch to using gpio-vbus transceiver

2011-03-16 16:32:48 +08:00

eseries.h

…

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

generic.c

…

generic.h

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

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

gumstix.c

ARM: pxa/gumstix: switch to using gpio-vbus transceiver

2011-03-16 16:32:48 +08:00

h5000.c

…

himalaya.c

…

hx4700.c

ARM: pxa/hx4700: use gpio arrays for global gpios

2011-07-11 14:43:30 +08:00

icontrol.c

…

idp.c

ARM: pxa: clean up set_pxa_fb_info

2011-03-16 16:32:47 +08:00

irq.c

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

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

Kconfig

mtd: pxa: convert to mtd_device_register()

2011-05-25 02:20:48 +01:00

leds-idp.c

…

leds-lubbock.c

…

leds-mainstone.c

…

leds.c

…

leds.h

…

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

lpd270.c

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

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

lubbock.c

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

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

magician.c

ARM: pxa/magician: use gpio arrays for backlight and global gpios

2011-07-11 14:43:30 +08:00

mainstone.c

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

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

Makefile

…

Makefile.boot

…

mfp-pxa2xx.c

ARM: pxa: fix PGSR register address calculation

2011-07-06 23:47:40 +08: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

…

mioa701.c

ARM: pxa/mioa701: use gpio arrays for global and gsm gpios

2011-07-11 14:43:31 +08:00

mp900.c

…

mxm8x10.c

ARM: pxa2xx: reorganize I2C files

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

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

palmld.c

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

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

palmt5.c

…

palmtc.c

ARM: pxa: clean up set_pxa_fb_info

2011-03-16 16:32:47 +08:00

palmte2.c

ARM: pxa: clean up set_pxa_fb_info

2011-03-16 16:32:47 +08:00

palmtreo.c

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

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

palmtx.c

…

palmz72.c

ARM: pm: hide 1st and 2nd arguments to cpu_suspend from platform code

2011-06-24 09:54:39 +01:00

pcm027.c

…

pcm990-baseboard.c

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2011-03-30 07:50:45 -07:00

pm.c

ARM: pm: move cpu_init() call into core code

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

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

pxa2xx.c

…

pxa3xx-ulpi.c

…

pxa3xx.c

ARM: pm: allow suspend finisher to return error codes

2011-07-02 09:54:01 +01:00

pxa25x.c

ARM: pm: hide 1st and 2nd arguments to cpu_suspend from platform code

2011-06-24 09:54:39 +01:00

pxa27x.c

ARM: pm: hide 1st and 2nd arguments to cpu_suspend from platform code

2011-06-24 09:54:39 +01:00

pxa95x.c

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

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

pxa300.c

…

pxa320.c

…

pxa930.c

…

raumfeld.c

ARM: pxa/raumfeld: fix device name for codec ak4104

2011-07-11 14:26:33 +08:00

reset.c

…

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

saarb.c

ARM: pxa/saarb: make use of pxa3xx_map_io()

2011-07-11 14:43:24 +08: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

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

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

standby.S

…

stargate2.c

ARM: pxa2xx: reorganize I2C files

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

tavorevb3.c

ARM: pxa2xx: reorganize I2C files

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

tavorevb.c

ARM: pxa: clean up set_pxa_fb_info

2011-03-16 16:32:47 +08:00

time.c

clocksource: convert ARM 32-bit up counting clocksources

2011-05-23 18:04:51 +01: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

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

trizeps4.c

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

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

viper.c

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

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

vpac270.c

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

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

xcep.c

ARM: pxa2xx: reorganize I2C files

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

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

zeus.c

ARM: pm: hide 1st and 2nd arguments to cpu_suspend from platform code

2011-06-24 09:54:39 +01:00

zylonite_pxa300.c

ARM: pxa2xx: reorganize I2C files

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

zylonite_pxa320.c

…

zylonite.c

ARM: pxa: clean up set_pxa_fb_info

2011-03-16 16:32:47 +08:00