Linus Torvalds 6aa033d7ef Merge master.kernel.org:/home/rmk/linux-2.6-arm ...

* master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6265/1: kirkwood: move qnap_tsx1x_register_flash() to .init.text
  ARM: 6263/1: ns9xxx: fix FTBFS for zImage
  ARM: 6262/1: arm/clps711x: fix debug macro compilation failure
  ARM: 6261/1: arm/shark: fix debug macro compilation failure
  ARM: 6260/1: arm/plat-spear: fix debug macro compilation failure
  ARM: 6259/1: arm/ns9xxx: fix debug macro compilation failure
  ARM: 6258/1: arm/h720x: fix debug macro compilation failure
  ARM: 6233/1: Delete a wrong redundant right parenthesis
  ARM: 6230/1: fix nuc900 touchscreen clk definition bug
  [ARM] pxa: fix incorrect CONFIG_CPU_PXA27x to CONFIG_PXA27x
  [ARM] pxa/colibri-pxa300: fix AC97 init
  [ARM] pxa: fix incorrect order of AC97 reset pin configs
  [ARM] pxa: fix frequency scaling for pcmcia/pxa2xx_base
  [ARM] pxa: cpufreq-pxa2xx: fix DRI recomputation routine
  [ARM] pxa/corgi: fix MMC/SD card detection failure

2010-07-26 08:20:38 -07:00

..

at91_cf.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

au1000_generic.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

au1000_generic.h

MIPS: Alchemy: use 36bit addresses for PCMCIA resources.

2010-02-27 12:53:43 +01:00

au1000_pb1x00.c

MIPS: PCMCIA: new socket driver for Au1000 demoboards.

2010-02-27 12:52:51 +01:00

bcm63xx_pcmcia.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

bcm63xx_pcmcia.h

…

bfin_cf_pcmcia.c

pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket

2010-05-10 10:23:12 +02:00

cardbus.c

pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket

2010-05-10 10:23:12 +02:00

cirrus.h

…

cistpl.c

sysfs: add struct file* to bin_attr callbacks

2010-05-21 09:37:31 -07:00

cs_internal.h

pcmcia: clarify alloc_io_space, move it to resource handlers

2010-05-10 10:23:19 +02:00

cs.c

pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket

2010-05-10 10:23:12 +02:00

db1xxx_ss.c

MIPS: DB1200: PCMCIA card detection must not be auto-enabled.

2010-04-30 20:52:43 +01:00

ds.c

pcmcia: do not initialize the present flag too late.

2010-07-05 12:37:48 +02:00

electra_cf.c

of: Remove duplicate fields from of_platform_driver

2010-05-22 00:10:40 -06:00

i82092.c

pcmcia: use dev_pm_ops for class pcmcia_socket_class

2010-03-24 11:00:11 +01:00

i82092aa.h

…

i82365.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

i82365.h

pcmcia: honor saved flags in yenta_socket's I365_CSCINT register

2010-03-15 14:50:15 +01:00

Kconfig

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

2010-05-20 09:09:46 -07:00

m8xx_pcmcia.c

of/pcmcia: m8xx_pcmcia.c: Fix build failures

2010-06-02 21:02:38 -06:00

m32r_cfc.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

m32r_cfc.h

…

m32r_pcc.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

m32r_pcc.h

…

Makefile

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

2010-05-20 09:09:46 -07:00

o2micro.h

pcmcia/yenta: add module parameter for O2 speedups

2010-02-17 17:37:35 +01:00

omap_cf.c

pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket

2010-05-10 10:23:12 +02:00

pcmcia_cis.c

pcmcia: update gfp/slab.h includes

2010-05-10 10:23:20 +02:00

pcmcia_ioctl.c

Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing

2010-05-24 08:01:10 -07:00

pcmcia_resource.c

pcmcia: fix 'driver ... did not release config properly' warning

2010-07-21 13:52:36 +02:00

pd6729.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

pd6729.h

…

pxa2xx_base.c

[ARM] pxa: fix frequency scaling for pcmcia/pxa2xx_base

2010-07-13 16:09:06 +08:00

pxa2xx_base.h

PCMCIA: fix pxa2xx_lubbock modular build error

2009-12-12 10:08:12 +00:00

pxa2xx_cm_x2xx.c

…

pxa2xx_cm_x255.c

PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket

2009-11-09 08:30:16 +01:00

pxa2xx_cm_x270.c

PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket

2009-11-09 08:30:16 +01:00

pxa2xx_e740.c

PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket

2009-11-09 08:30:16 +01:00

pxa2xx_lubbock.c

PCMCIA: sa1111: remove duplicated initializers

2009-11-09 08:30:12 +01:00

pxa2xx_mainstone.c

PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket

2009-11-09 08:30:16 +01:00

pxa2xx_palmld.c

PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket

2009-11-09 08:30:16 +01:00

pxa2xx_palmtc.c

ARM: pxa: fix now incorrect reference of skt->irq by using skt->socket.pci_irq

2009-12-13 16:33:13 +00:00

pxa2xx_palmtx.c

PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket

2009-11-09 08:30:16 +01:00

pxa2xx_sharpsl.c

PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket

2009-11-09 08:30:16 +01:00

pxa2xx_stargate2.c

ARM: pxa: fix now incorrect reference of skt->irq by using skt->socket.pci_irq

2009-12-13 16:33:13 +00:00

pxa2xx_trizeps4.c

PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket

2009-11-09 08:30:16 +01:00

pxa2xx_viper.c

[ARM] pxa/zeus: make Viper pcmcia support more generic to support Zeus

2009-12-13 21:42:58 +08:00

pxa2xx_vpac270.c

[ARM] pxa: add support for Voipac PXA270 PCMCIA

2010-05-11 17:25:02 +02:00

ricoh.h

…

rsrc_iodyn.c

pcmcia: update gfp/slab.h includes

2010-05-10 10:23:20 +02:00

rsrc_mgr.c

pcmcia: clarify alloc_io_space, move it to resource handlers

2010-05-10 10:23:19 +02:00

rsrc_nonstatic.c

pcmcia: do not autoadd root PCI bus resources

2010-05-10 10:23:19 +02:00

sa11xx_base.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

sa11xx_base.h

…

sa1100_assabet.c

PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket

2009-11-09 08:30:16 +01:00

sa1100_badge4.c

PCMCIA: sa1111: remove duplicated initializers

2009-11-09 08:30:12 +01:00

sa1100_cerf.c

PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket

2009-11-09 08:30:16 +01:00

sa1100_generic.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

sa1100_generic.h

…

sa1100_h3600.c

ARM: 5824/1: SA1100: reuse h3600 PCMCIA driver on h3100

2009-12-06 16:52:57 +00:00

sa1100_jornada720.c

PCMCIA: sa1111: remove duplicated initializers

2009-11-09 08:30:12 +01:00

sa1100_neponset.c

PCMCIA: sa1111: remove duplicated initializers

2009-11-09 08:30:12 +01:00

sa1100_shannon.c

PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket

2009-11-09 08:30:16 +01:00

sa1100_simpad.c

PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket

2009-11-09 08:30:16 +01:00

sa1111_generic.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

sa1111_generic.h

PCMCIA: sa1111: remove duplicated initializers

2009-11-09 08:30:12 +01:00

soc_common.c

PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket

2009-11-09 08:30:16 +01:00

soc_common.h

PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket

2009-11-09 08:30:16 +01:00

socket_sysfs.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

tcic.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

tcic.h

…

ti113x.h

pcmcia: re-route Cardbus IRQ to ISA on ti1130 bridges if necessary

2010-03-15 14:50:16 +01:00

topic.h

pcmcia: correct handling for Zoomed Video registers in topic.h

2009-11-11 19:34:27 +01:00

vg468.h

…

vrc4171_card.c

pcmcia: use dev_pm_ops for class pcmcia_socket_class

2010-03-24 11:00:11 +01:00

vrc4173_cardu.c

…

vrc4173_cardu.h

…

xxs1500_ss.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

yenta_socket.c

pcmcia: yenta_socket.c Remove extra #ifdef CONFIG_YENTA_TI

2010-06-07 18:22:57 +02:00

yenta_socket.h

…