Linus Torvalds 2f2c779583 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ...

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits)
  ctcm: rename READ/WRITE defines to avoid redefinitions
  claw: rename READ/WRITE defines to avoid redefinitions
  phylib: available for any speed ethernet
  can: add limit for nframes and clean up signed/unsigned variables
  pkt_sched: Check .walk and .leaf class handlers
  pkt_sched: Fix sch_sfq vs tc_modify_qdisc oops
  caif-spi: Bugfix SPI_DATA_POS settings were inverted.
  caif: Bugfix - Increase default headroom size for control channel.
  net: make netpoll_rx return bool for !CONFIG_NETPOLL
  Bluetooth: Use 3-DH5 payload size for default ERTM max PDU size
  Bluetooth: Fix incorrect setting of remote_tx_win for L2CAP ERTM
  Bluetooth: Change default L2CAP ERTM retransmit timeout
  Bluetooth: Fix endianness issue with L2CAP MPS configuration
  net: Use NET_XMIT_SUCCESS where possible.
  isdn: mISDN: call pci_disable_device() if pci_probe() failed
  isdn: avm: call pci_disable_device() if pci_probe() failed
  isdn: avm: call pci_disable_device() if pci_probe() failed
  usbnet: rx_submit() should return an error code.
  pkt_sched: Add some basic qdisc class ops verification. Was: [PATCH] sfq: add dummy bind/unbind handles
  pkt_sched: sch_sfq: Add dummy unbind_tcf and put handles. Was: [PATCH] sfq: add dummy bind/unbind handles
  ...

2010-08-13 10:38:12 -07:00

..

ath

ath9k: fix erased ieee80211_rx_status.mactime

2010-08-04 15:28:37 -04:00

b43

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

2010-08-06 12:25:06 -07:00

b43legacy

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2010-06-11 11:34:06 -07:00

hostap

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

2010-08-06 12:25:06 -07:00

ipw2x00

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

2010-08-06 13:30:43 -07:00

iwlwifi

iwlagn: fix rts cts protection

2010-08-09 15:18:57 -04:00

iwmc3200wifi

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2010-07-01 17:34:14 -07:00

libertas

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2010-08-13 10:38:12 -07:00

libertas_tf

param: simple locking for sysfs-writable charp parameters

2010-08-11 23:04:31 +09:30

orinoco

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

2010-08-06 12:25:06 -07:00

p54

Revert "p54pci: Add PCI ID for SMC2802W"

2010-08-09 12:04:56 -04:00

prism54

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2010-07-13 15:57:29 -04:00

rt2x00

rt2x00: do not use PCI resources before pci_enable_device()

2010-08-04 15:28:37 -04:00

rtl818x

rtl8180: avoid potential NULL deref in rtl8180_beacon_work

2010-08-05 16:05:27 -04:00

wl12xx

net: wl12xx: do not use kfree'd memory

2010-08-04 15:27:38 -04:00

zd1211rw

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2010-06-17 14:19:06 -07:00

adm8211.c

drivers/net/wireless: Use wiphy_<level>

2010-07-27 15:14:13 -04:00

adm8211.h

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

airo_cs.c

pcmcia: do not request windows if you don't need to

2010-08-03 09:04:21 +02:00

airo.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6

2010-07-27 11:59:19 -04:00

airo.h

…

at76c50x-usb.c

drivers/net/wireless/at76c50x-usb.c: Neaten macros

2010-07-27 15:14:13 -04:00

at76c50x-usb.h

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2010-07-01 17:34:14 -07:00

atmel_cs.c

pcmcia: do not use io_req_t when calling pcmcia_request_io()

2010-08-03 09:04:11 +02:00

atmel_pci.c

…

atmel.c

net: trans_start cleanups

2010-05-10 05:01:31 -07:00

atmel.h

…

Kconfig

wireless: depends on NET

2010-05-10 14:56:49 -04:00

mac80211_hwsim.c

drivers/net/wireless: Use wiphy_<level>

2010-07-27 15:14:13 -04:00

Makefile

…

mwl8k.c

mwl8k: add get_survey callback in order to get channel noise

2010-07-29 12:46:45 -04:00

ray_cs.c

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

2010-08-06 12:25:06 -07:00

ray_cs.h

pcmcia: dev_node removal (drivers with unregister_netdev check)

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

rayctl.h

…

rndis_wlan.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2010-07-01 17:34:14 -07:00

wl3501_cs.c

pcmcia: do not use io_req_t when calling pcmcia_request_io()

2010-08-03 09:04:11 +02:00

wl3501.h

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

zd1201.c

drivers/net: Remove unnecessary returns from void function()s

2010-05-14 00:19:28 -07:00

zd1201.h

…