linux/drivers/ssb
Linus Torvalds 06f4e926d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.
2011-05-20 13:43:21 -07:00
..
b43_pci_bridge.c ssb: b43-pci-bridge: Add new vendor for BCM4318 2010-11-22 15:19:31 -05:00
driver_chipcommon_pmu.c ssb: cc: use correct min_msk for 0x4312 2011-04-25 14:50:13 -04:00
driver_chipcommon.c ssb: cc: prepare clockmode support for cores rev 10+ 2011-05-02 14:49:14 -04:00
driver_extif.c ssb: Make the GPIO API reentrancy safe 2008-02-20 20:11:49 -05:00
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 ssb: move ssb_commit_settings and export it 2011-05-11 14:50:41 -04:00
embedded.c SSB: BCM47xx: Export ssb_watchdog_timer_set 2009-06-08 16:57:50 +01:00
Kconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
main.c ssb: fix pcicore build breakage 2011-05-13 15:05:46 -04:00
Makefile ssb: Implement SDIO host bus support 2009-09-09 11:19:00 -04:00
pci.c SSB: Change fallback sprom to callback mechanism. 2011-05-19 09:55:47 +01:00
pcihost_wrapper.c ssb: Clear RETRY_TIMEOUT in PCI Configuration for normal devices 2010-11-15 13:23:28 -05:00
pcmcia.c ssb-pcmcia: Fix parsing of invariants tuples 2011-02-07 16:02:14 -05:00
scan.c ssb: update list of devices supporting multiple 80211 cores 2011-05-11 10:17:17 -04:00
sdio.c ssb/sdio: fix printk format warnings 2009-09-16 16:21:00 -04:00
sprom.c SSB: Change fallback sprom to callback mechanism. 2011-05-19 09:55:47 +01:00
ssb_private.h SSB: Change fallback sprom to callback mechanism. 2011-05-19 09:55:47 +01:00