linux-sg2042/drivers/staging/winbond
Linus Torvalds 7a6362800c 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: (1480 commits)
  bonding: enable netpoll without checking link status
  xfrm: Refcount destination entry on xfrm_lookup
  net: introduce rx_handler results and logic around that
  bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag
  bonding: wrap slave state work
  net: get rid of multiple bond-related netdevice->priv_flags
  bonding: register slave pointer for rx_handler
  be2net: Bump up the version number
  be2net: Copyright notice change. Update to Emulex instead of ServerEngines
  e1000e: fix kconfig for crc32 dependency
  netfilter ebtables: fix xt_AUDIT to work with ebtables
  xen network backend driver
  bonding: Improve syslog message at device creation time
  bonding: Call netif_carrier_off after register_netdevice
  bonding: Incorrect TX queue offset
  net_sched: fix ip_tos2prio
  xfrm: fix __xfrm_route_forward()
  be2net: Fix UDP packet detected status in RX compl
  Phonet: fix aligned-mode pipe socket buffer header reserve
  netxen: support for GbE port settings
  ...

Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
with the staging updates.
2011-03-16 16:29:25 -07:00
..
Kconfig Staging: wireless drivers Kconfig change 2009-10-30 14:47:44 -07:00
Makefile Staging: w35und: Merge mlmetxrx.c to mds.c 2010-12-01 14:45:46 -08:00
TODO staging: w35und: Add locking problems to TODO list 2010-09-21 10:46:04 -07:00
core.h staging: winbond: needs <linux/delay.h> for msleep and friends 2011-02-28 19:14:22 -08:00
localpara.h staging: winbond: localpara.h whitespace and indentation fixes. 2010-05-11 15:01:44 -07:00
mac_structures.h Staging: w35und: Kill unused code in mac_structures.h 2010-12-01 14:45:45 -08:00
mds.c Staging: w35und: Kill wblinux_f.h header 2010-12-01 14:45:47 -08:00
mds_f.h Staging: w35und: Kill empty Mds_Destroy function 2010-11-09 16:07:00 -08:00
mds_s.h Staging: w35und: Kill write-only ->TxToggle 2010-12-01 14:45:46 -08:00
mto.c Staging: w35und: Remove empty sysdef.h header 2010-12-01 14:45:45 -08:00
mto.h Staging: winbond: mto.h Coding style fixes 2010-05-11 11:35:48 -07:00
phy_calibration.c Staging: w35und: Remove empty sysdef.h header 2010-12-01 14:45:45 -08:00
phy_calibration.h Staging: w35und: Rename wbhal_s.h to wbhal.h 2010-11-09 15:55:55 -08:00
reg.c Staging: w35und: Kill _IBSS_BEACON_SEQ_STICK_ 2010-12-01 14:45:46 -08:00
sme_api.h Staging: winbond: sme_api.h Coding style fixes. 2010-05-11 11:35:48 -07:00
wb35reg.c staging: winbond: Remove NULL check before kfree 2011-03-14 11:57:38 -07:00
wb35reg_f.h Staging: w35und: Rename wbhal_s.h to wbhal.h 2010-11-09 15:55:55 -08:00
wb35reg_s.h Staging: w35und: Remove unused fields from struct wb_usb 2010-12-01 14:45:47 -08:00
wb35rx.c Staging: w35und: Kill struct wb_usb 2010-12-01 14:45:47 -08:00
wb35rx_f.h Staging: w35und: Rename wbhal_s.h to wbhal.h 2010-11-09 15:55:55 -08:00
wb35rx_s.h Staging: w35und: typedef removal 2009-04-03 14:53:16 -07:00
wb35tx.c Staging: w35und: Kill struct wb_usb 2010-12-01 14:45:47 -08:00
wb35tx_f.h Staging: w35und: Merge wbhal_f.h to wbhal_s.h 2010-11-09 15:55:55 -08:00
wb35tx_s.h Staging: w35und: typedef removal 2009-04-03 14:53:16 -07:00
wbhal.h Staging: w35und: Kill struct wb_usb 2010-12-01 14:45:47 -08:00
wbusb.c mac80211: make tx() operation return void 2011-02-25 15:32:34 -05:00