Linus Torvalds f1dd6ad599 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus ...

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (141 commits)
  MIPS: Alchemy: defconfig updates
  MIPS: Alchemy: Fix Au1100 ethernet build failure
  MIPS: Alchemy: Repair db1500/bosporus builds
  MIPS: ARC: Cleanup unused definitions from sgialib.h
  MIPS: Cobalt: convert legacy port addresses to GT-64111 bus addresses
  MIPS: Alchemy: use 36bit addresses for PCMCIA resources.
  MIPS: Cobalt: Fix theoretical port aliasing issue
  MIPS: Use ALIGN(x, bytes) instead of __ALIGN_MASK(x, bytes - 1)
  MIPS: Crazy spinlock speed test.
  MIPS: Optimize spinlocks.
  MIPS: Alchemy: devboard PM needs to save CPLD registers.
  MIPS: PowerTV: Eliminate duplicate opcode definition macros
  MIPS: Lemote 2F: Move printks out of port_access_lock.
  MIPS: PNX833x: Convert IRQ controller locks to raw spinlocks.
  MIPS: Octeon: Replace spinlock with raw_spinlocks in dma-octeon.c.
  MIPS: Octeon: Replace rwlocks in irq_chip handlers with raw_spinlocks.
  MIPS: Octeon: Convert octeon_irq_msi_lock to raw spinlock.
  MIPS: Loongson: Remove pointless sample_lock from oprofile code.
  MIPS: SNI: Convert sni_rm200_i8259A_lock to raw spinlock.
  MIPS: i8259: Convert IRQ controller lock to raw spinlock.
  ...

2010-02-27 16:19:22 -08:00

..

at91_cf.c

pcmcia/at91_cf: don't redefine SZ_2K

2010-02-17 17:48:10 +01:00

au1000_generic.c

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

2010-02-27 12:53:43 +01: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

MIPS: BCM63xx: Add PCMCIA & Cardbus support.

2009-09-30 21:47:01 +02:00

bcm63xx_pcmcia.h

MIPS: BCM63xx: Add PCMCIA & Cardbus support.

2009-09-30 21:47:01 +02:00

bfin_cf_pcmcia.c

pcmcia/bfin_cf: don't check platform_get_irq's return value against zero

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

cardbus.c

pcmcia: CardBus doesn't need CIS access

2010-01-17 18:30:13 +01:00

cirrus.h

pcmcia: drop already defined PCI_IDs

2009-10-24 17:13:01 +02:00

cistpl.c

pcmcia: use read_cis_mem return value

2010-02-17 18:01:31 +01:00

cs_internal.h

pcmcia: delay re-scanning and re-querying of PCMCIA bus

2010-02-17 17:48:26 +01:00

cs.c

pcmcia: remove useless msleep in ds.c

2010-02-17 18:05:54 +01:00

db1xxx_ss.c

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

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

ds.c

pcmcia: remove useless msleep in ds.c

2010-02-17 18:05:54 +01:00

electra_cf.c

pcmcia: make Open Firmware device id constant

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

i82092.c

PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()

2009-09-29 00:10:41 +02:00

i82092aa.h

pcmcia: remove CVS keywords

2008-06-24 15:33:37 +02:00

i82365.c

pcmcia: use dynamic debug in PCMCIA socket drivers

2009-11-08 18:23:13 +01:00

i82365.h

pcmcia/i82365: fix typos in comments

2010-02-17 17:48:12 +01:00

Kconfig

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

2010-02-27 16:19:22 -08:00

m8xx_pcmcia.c

pcmcia: make Open Firmware device id constant

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

m32r_cfc.c

pcmcia: m32r uses static socket resources

2010-01-24 19:57:56 +01:00

m32r_cfc.h

…

m32r_pcc.c

pcmcia: use dynamic debug in PCMCIA socket drivers

2009-11-08 18:23:13 +01:00

m32r_pcc.h

…

Makefile

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

2010-02-27 16:19:22 -08:00

o2micro.h

pcmcia/yenta: add module parameter for O2 speedups

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

omap_cf.c

pcmcia/omap_cf: don't redefine SZ_2K

2010-02-17 17:48:11 +01:00

pcmcia_ioctl.c

pcmcia: use pccardd to handle eject, insert, suspend and resume requests

2010-02-17 17:48:25 +01:00

pcmcia_resource.c

pcmcia: assert locking to struct pcmcia_device

2010-02-17 17:48:22 +01:00

pd6729.c

pcmcia: use dev_dbg and dev_print in pd6729.c

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

pd6729.h

pcmcia: use dev_dbg and dev_print in pd6729.c

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

pxa2xx_base.c

PCMCIA: fix pxa2xx_lubbock modular build error

2009-12-16 20:11:02 +00:00

pxa2xx_base.h

PCMCIA: fix pxa2xx_lubbock modular build error

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

pxa2xx_cm_x2xx.c

[ARM] 5283/1: pxa: add CM-X255 pcmcia support

2008-10-07 12:08:02 +01:00

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

ricoh.h

…

rsrc_mgr.c

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

2010-02-27 16:18:30 -08:00

rsrc_nonstatic.c

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

2010-02-27 16:18:30 -08:00

sa11xx_base.c

PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket

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

sa11xx_base.h

PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data

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

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

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

2009-12-06 16:52:57 +00: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

drivers/pcmcia: remove unnecessary kzalloc

2009-11-22 13:03:50 +01: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

pcmcia: delay re-scanning and re-querying of PCMCIA bus

2010-02-17 17:48:26 +01:00

tcic.c

pcmcia: use dynamic debug in PCMCIA socket drivers

2009-11-08 18:23:13 +01:00

tcic.h

…

ti113x.h

pcmcia: use dev_printk and dev_dbg in yenta_socket

2008-08-23 01:49:44 +02: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

PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()

2009-09-29 00:10:41 +02:00

vrc4173_cardu.c

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

vrc4173_cardu.h

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

xxs1500_ss.c

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

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

yenta_socket.c

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

2010-02-27 16:18:30 -08:00

yenta_socket.h

…