linux-stable/drivers/ssb
Linus Torvalds 1685e633b3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq
  pcmcia: do not request windows if you don't need to
  pcmcia: insert PCMCIA device resources into resource tree
  pcmcia: export resource information to sysfs
  pcmcia: use struct resource for PCMCIA devices, part 2
  pcmcia: remove memreq_t
  pcmcia: move local definitions out of include/pcmcia/cs.h
  pcmcia: do not use io_req_t when calling pcmcia_request_io()
  pcmcia: do not use io_req_t after call to pcmcia_request_io()
  pcmcia: use struct resource for PCMCIA devices
  pcmcia: clean up cs.h
  pcmcia: use pcmica_{read,write}_config_byte
  pcmcia: remove cs_types.h
  pcmcia: remove unused flag, simplify headers
  pcmcia: remove obsolete CS_EVENT_ definitions
  pcmcia: split up central event handler
  pcmcia: simplify event callback
  pcmcia: remove obsolete ioctl

Conflicts in:
 - drivers/staging/comedi/drivers/*
 - drivers/staging/wlags49_h2/wl_cs.c
due to dev_info_t and whitespace changes
2010-08-06 12:25:06 -07:00
..
b43_pci_bridge.c b43: Add BCM4307 PCI-ID 2009-03-27 20:13:20 -04:00
driver_chipcommon.c ssb: Handle alternate SSPROM location 2010-06-04 15:04:50 -04:00
driver_chipcommon_pmu.c ssb: update PMU init to match specs 2010-06-03 14:10:43 -04:00
driver_extif.c
driver_gige.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
driver_mipscore.c ssb: fix interrupt assignment 2010-02-08 16:50:54 -05:00
driver_pcicore.c MIPS: Fix SSB PCIcore IO resource management 2010-04-12 17:26:14 +01:00
embedded.c SSB: BCM47xx: Export ssb_watchdog_timer_set 2009-06-08 16:57:50 +01:00
Kconfig ssb: Implement SDIO host bus support 2009-09-09 11:19:00 -04:00
main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 2010-08-06 12:25:06 -07:00
Makefile ssb: Implement SDIO host bus support 2009-09-09 11:19:00 -04:00
pci.c ssb: Handle alternate SSPROM location 2010-06-04 15:04:50 -04:00
pcihost_wrapper.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
pcmcia.c pcmcia: use pcmica_{read,write}_config_byte 2010-08-03 09:02:35 +02:00
scan.c pcmcia: remove cs_types.h 2010-07-30 21:07:39 +02:00
sdio.c ssb/sdio: fix printk format warnings 2009-09-16 16:21:00 -04:00
sprom.c ssb: fix NULL ptr deref when pcihost_wrapper is used 2010-05-28 13:57:01 -04:00
ssb_private.h ssb: fix typo in ifdef comment 2010-02-15 16:12:53 -05:00