From: David Miller on

The biggest two things in here are RPS (Receive Packet Steering) and
RFS (Receive Flow Steering) support from Tom Herbert et al. at Google.

RPS allows one to specify a cpu mask per device RX queue, and we will
steer RX packet work, in software, to those cpus. RPS essentially
provides in software what many modern cards can do in hardware with
the added flexibility of being able to constrain CPU targets
arbitrarily. RPS is also, therefore, not in conflict with cards that
can flow distribute to cpus completely in hardware.

RFS tries to be even more sophisticated than RPS. It watches on which
cpu a socket makes I/O calls, and will steer future RX packets to that
cpu. In this way RX packet work is done near to where the application
will actually process the data.

In both the case of RPS and RFS, if the device provides a flow hash
(just about every modern card does), we make use of it instead of
computing it in software.

RPS/RFS has been found to even help for things like tbench over
loopback.

Eric Dumazet has been busy, as usual, avoiding unnecessary atomic
operations and false sharing in the hot paths. Particularly in UDP.
A lot of these issues showed up now that we have RPS/RFS, which
tended to clean out the profiles.

Some other things that stand out:

1) Allow the administrator to reserve port ranges, such that the
kernel bind allocation scheme won't use them. From Amerigo Wang.

2) ipv6 address et al. handling converted to use generic kernel lists.
From Stephem Hemminger.

3) PHY module autoloading support from David Howells

4) Device address (multicast, unicast) list traversal is formalized.
From Jiri Pirko.

5) Support for multiple multicast routing tables, from Patrick McHardy.

6) New protocol stack, CAIF (a MUX protocol developed by ST-Ericsson
for modems). Via Sjur Braendeland.

7) Cache bundles instead of policies in the IPSEC flow cache, by
Timo Teräs.

8) IPV6 bridge multicast snooping support from YOSHIFUJI Hideaki.

The majority of the rest is driver stuff, as it usually is.

Please pull, thanks a lot!

The following changes since commit 537b60d17894b7c19a6060feae40299d7109d6e7:
Linus Torvalds (1):
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip

are available in the git repository at:

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

Abhijeet Kolekar (7):
iwl3945: check ucode load error code
iwlwifi: add debugfs ops to iwlwifi
iwlwifi: reset pci retry timeout
iwl3945: add ucode statistics
iwl3945: fix scan races
iwl3945: add plcp error checking
mac80211: fix paged defragmentation

Adam Nielsen (1):
netfilter: xt_LED: add refcounts to LED target

Alan Cox (2):
caif: check write operations
caif: tty's are kref objects so take a reference

Alban Browaeys (2):
rt2x00: txdone implementation supporting hw encryption.
rt2x00: Fix TX status reporting for rt2800pci.

Alexander Duyck (9):
igb: Do not overwrite mdicnfg register when accessing 82580 phy
igb: cleanup usage of virtualization registers
igb: add support for Intel I350 Gigabit Network Connection
igb: update hw_debug macro to make use of netdev_dbg call
igb: modify register test for i350 to reflect read only bits in RDLEN/TDLEN
skbuff: remove unused dev_consume_skb macro definition
igb: add support for reporting 5GT/s during probe on PCIe Gen2
igb: convert igb from using PCI DMA functions to using DMA API functions
e1000e: increase rx fifo size to 36K on 82574 and 82583

Alexander Kurz (1):
net/pcmcia/3c589_cs: using netdev_info and friends where appropriate

Alexey Dobriyan (4):
netfilter: nf_conntrack: restrict runtime expect hashsize modifications
netfilter: xtables: compat out of scope fix
netfilter: xtables: make XT_ALIGN() usable in exported headers by exporting __ALIGN_KERNEL()
Restore __ALIGN_MASK()

Allan Stephens (16):
tipc: Eliminate obsolete port's "congested_link" field
tipc: Eliminate unused argument in print statement
tipc: Prune unused data structures from configuration service
tipc: Eliminate unnecessary initialization in native API send routines
tipc: Rename "multicast-link" to "broadcast-link"
tipc: Add support for "-s" configuration option
tipc: Update commenting in TIPC API
tipc: remove abstraction for link_max_pkt
tipc: Relocate trivial link status functions to header file
tipc: add tipc_ prefix to fcns targeted for un-inlining
tipc: Reduce footprint by un-inlining address routines
tipc: Reduce footprint by un-inlining nmap routines
tipc: Reduce footprint by un-inlining port list routines
tipc: Reduce footprint by un-inlining bearer congestion routine
tipc: Reduce footprint by un-inlining buf_acquire routine
tipc: Reduce footprint by un-inlining tipc_msg_* routines

Amerigo Wang (3):
netconsole: do not depend on experimental
sysctl: refactor integer handling proc code
net: reserve ports for applications using fixed port numbers

Amit Kumar Salecha (27):
netxen: fix corner cases of firmware recovery
netxen: fix fw load from file
netxen: fix interrupt for NX2031
qlcnic: fix fw load from file
qlcnic: add driver debug support
qlcnic: fix interface attach sequence
qlcnic: fix endianness in fw validation
qlcnic: update version to 5.0.1
qlcnic: additional driver statistics
qlcnic: fix defines as per IDC document
qlcnic: fix fw initialization responsibility
qlcnic: define macro for driver state
qlcnic: fix pci semaphore checks
qlcnic: fix rcv buffer leak
qlcnic: protect resource access
qlcnic: update version 5.0.2
netxen: fix register usage
netxen: handle queue manager access
qlcnic: fix context cleanup
qlcnic: remove obsolete register
qlcnic: fix caching window register
qlcnic: cleanup dma mask setting
qlcnic: cleanup unused code
qlcnic: module param for firmware load option
qlcnic: remove unused register
qlcnic: mark device state fail
qlcnic: adding co maintainer

Amitkumar Karwar (1):
libertas: add auto auth mode feature

Andrea Gelmini (1):
netfilter: include/linux/netfilter/nf_conntrack_tuple_common.h: Checkpatch cleanup

Andreas Bombe (1):
ARCNET: Limit com20020 PCI ID matches for SOHARD cards

Andres Salomon (1):
mac80211: give warning if building w/out rate ctrl algorithm

Andrew Blaich (1):
ath5k: fixing retries in ath5k_hw_setup_4word_tx_desc

Andrew Hendry (1):
X25: Add if_x25.h and x25 to device identifiers

Andy Grover (9):
RDS: Do not BUG() on error returned from ib_post_send
RDS: sendmsg() should check sndtimeo, not rcvtimeo
RDS: update copy_to_user state in tcp transport
RDS/TCP: Wait to wake thread when write space available
RDS: Fix congestion issues for loopback
RDS: Workaround for in-use MRs on close causing crash
RDS: Turn down alarming reconnect messages
RDS: only put sockets that have seen congestion on the poll_waitq
RDS: Do not call set_page_dirty() with irqs off

Anirban Chakraborty (1):
qlcnic: fix memory leaks

Anjali Singhai (1):
ixgbe: Properly display 1 gig downshift warning for backplane

Anton Vorontsov (2):
gianfar: Remove legacy PM callbacks
fsl_pq_mdio: Fix mdiobus allocation handling

Barry Song (1):
netdev: bfin_mac: add support for IEEE 1588 PTP

Bart De Schuymer (6):
netfilter: bridge-netfilter: cleanup br_netfilter.c
netfilter: bridge-netfilter: update a comment in br_forward.c about ip_fragment()
netfilter: bridge-netfilter: simplify IP DNAT
netfilter: bridge-netfilter: Fix MAC header handling with IP DNAT
netfilter: bridge-netfilter: fix refragmenting IP traffic encapsulated in PPPoE traffic
netfilter: bridge-netfilter: fix crash in br_nf_forward_finish()

Baruch Siach (1):
dm9000: fix "BUG: spinlock recursion"

Ben Hutchings (11):
3c503: Fix IRQ probing
sfc: Consistently report short MCDI responses as EIO
sfc: Log specific message for failure of NVRAM self-test
sfc: Enable IPv6 RSS using random key for Toeplitz hash
sfc: Update MCDI protocol definitions
sfc: Break NAPI processing after one ring-full of TX completions
sfc: Add necessary parentheses to macro definitions in net_driver.h
sfc: Clean up efx_nic::irq_zero_count
sfc: Test only the first pair of TX queues
sfc: Create multiple TX queues
rndis_host: Poll status channel before control channel

Ben M Cahill (1):
iwlagn: Add Flow-handler (FH) register dump for 4965.

Benoit Papillault (3):
ath5k: Fix TX/RX padding for all frames
ath5k/ath9k: Fix 64 bits TSF reads
ath9k: Added get_survey callback in order to get channel noise

Bing Zhao (3):
Bluetooth: Decode btmrvl MODULE_BRINGUP_REG response correctly
Bluetooth: Separate btmrvl_register_hdev() from btmrvl_add_card()
Bluetooth: Set hdev->dev_type based on Marvell device type

Bjørn Mork (1):
ipv6: udp: make short packet logging consistent with ipv4

Bob Copeland (4):
ath5k: correct channel setting for 2.5 mhz spacing
ath5k: clean up queue manipulation
ath5k: fix race condition in tx desc processing
ath5k: add bounds check to pdadc table

Brian Haley (4):
SCTP: Change to use ipv6_addr_copy()
IPv6: data structure changes for new socket options
IPv6: Add dontfrag argument to relevant functions
IPv6: Complete IPV6_DONTFRAG support

Brian King (1):
ibmveth: Add suspend/resume support

Bruce Allan (15):
e1000e: Use pr_<level> and netdev_<level>
e1000e: reset MAC-PHY interconnect on 82577/82578 during Sx->S0
e1000e: Reset 82577/82578 PHY before first PHY register read
e1000e: use static params to save stack space (part 2)
e1000e: bad state after running ethtool diagnostics with AMT enabled
e1000e: initialize manageability (IPMI) pass-through in 82574/82583
e1000e: s/w initiated LSC MSI-X interrupts not generated; no transmit
e1000e: cleanup multiple common exit points
e1000e: Remove EN_MAC_ADDR_FILTER check from enable_mng_pass_thru check
e1000e: Cleanup e1000_sw_lcd_config_ich8lan()
e1000e: Incorrect function pointer set for force_speed_duplex on 82577
e1000e: fix checks for manageability enabled and management pass-through
e1000e: move settting of flow control refresh timer to link setup code
e1000e: Fix/cleanup PHY reset code for ICHx/PCHx
e1000e: add PCI device id to enable support for 82567V-4

Bruno Randolf (23):
mac80211: fix rates setup on IBSS merge
ath5k: add antenna statistics and debugfs file for antenna settings
ath5k: preserve antenna settings
ath5k: remove double opmode definition
ath5k: remove ah_magic
ath5k: remove ah_mac_revision
ath5k: remove ah_gpio_npins
ath5k: add debugfs file frameerrors
ath5k: IQ calibration for AR5211 is slightly different
ath5k: Minor EEPROM documentation updates
mac80211: (really) fix rates setup on IBSS merge
ath5k: remove static calibration interval variable
ath5k: remove the use of SWI interrupt
ath5k: optimize ath5k_hw_calibration_poll
ath5k: move ath5k_hw_calibration_poll to base.c
ath5k: keep beacon RSSI average
ath5k: initialize default noise floor
ath5k: simplify MIB counters
ath5k: update phy errors codes
ath5k: add capability flag for phyerror counters
ath5k: Adaptive Noise Immunity (ANI) Implementation
ath5k: Use high bitrates for ACK/CTS
ath5k: treat RXORN as non-fatal

Bryan Wu (1):
netdev/fec.c: add phylib supporting to enable carrier detection (v2)

Changli Gao (7):
rps: keep the old behavior on SMP without rps
net: CONFIG_SMP should be CONFIG_RPS
rps: optimize rps_get_cpu()
net: reimplement softnet_data.output_queue as a FIFO queue
net: batch skb dequeueing from softnet input_pkt_queue
xfrm: potential uninitialized variable num_xfrms
net: fix softnet_stat

Christian Lamparter (5):
p54: Enable HW_REPORTS_TX_ACK_STATUS
ar9170usb: fix panic triggered by undersized rxstream buffer
ar9170usb: add a couple more USB IDs
p54pci: fix serious sparse warning
ar9170usb: remove deprecated aggregation code

Christoph Hellwig (1):
vhost: fix sparse warnings

Cindy H Kao (6):
wimax/i2400m: fix the race condition for accessing TX queue
wimax/i2400m: correct the error path handlers in dev_start()
wimax/i2400m: fix for missed reset events if triggered by dev_reset_handle()
wimax/i2400m: add the error recovery mechanism on TX path
wimax/i2400m: Correct the error path handlers order in i2400m_post_reset()
wimax/i2400m: Reset the TX FIFO indices when allocating the TX FIFO in tx_setup()

Dan Carpenter (21):
bridge: cleanup: remove unused assignment
stmmac: use resource_size()
ewrk3: range checking problem
korina: use resource_size()
mac80211: remove unneed variable from ieee80211_tx_pending()
llc: cleanup: remove dead code from llc_init()
wimax: remove unneeded variable
rds: cleanup: remove unneeded variable
iwl: cleanup: remove unneeded error handling
ipv6: cleanup: remove unneeded null check
sctp: cleanup: remove duplicate assignment
Bluetooth: Fix storing negative values as unsigned char
iwlwifi: remove stray mutex_unlock()
ath9k/htc_drv_main: null dereference typo
ath9k/htc_drv_main: off by one error
ath5k: several off by one range checks
wl1271: add missing spin_lock()
wl1271: fix notifier interface supported test
wl1271: remove some unneeded code
wimax: checking ERR_PTR vs null
wimax: wimax_msg_alloc() returns ERR_PTR not null

Dan Williams (3):
libertas: consolidate SDIO firmware wait code
libertas: Davinci platforms need more time loading helper firmware
libertas: fix 8686 firmware loading regression

Daniel Halperin (2):
mac80211: fix typo in comments
iwlwifi: set AMPDU status variables correctly

Daniel Mack (1):
libertas/sdio: 8686: set ECSI bit for 1-bit transfers

Daniel Ngu (1):
drivers/net/wireless/b43/main.c:4351: Fixed coding style

Daniel Yingqiang Ma (1):
ath9k: Group Key fix for VAPs

David Daney (6):
netdev: octeon_mgmt: Use proper MAC addresses.
netdev: octeon_mgmt: Fix race condition freeing TX buffers.
netdev: octeon_mgmt: Fix race manipulating irq bits.
netdev: octeon_mgmt: Free TX skbufs in a timely manner.
netdev: octeon_mgmt: Try not to drop TX packets when stopping the queue.
netdev: octeon_mgmt: Remove some gratuitous blank lines.

David Kilroy (10):
orinoco: implement set_wiphy_params
orinoco: use cfg80211_find_ie
orinoco: have sparse check endian issues
orinoco: add hermes_ops
orinoco: allow driver to specify netdev_ops
orinoco: encapsulate driver locking
orinoco: add orinoco_usb driver
orinoco_usb: avoid in_atomic
orinoco_usb: implement fw download
orinoco: refactor xmit path

David S. Miller (55):
e1000e: Fix build with CONFIG_PM disabled.
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
ipv6: Fix bug in ipv6_chk_same_addr().
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6
ipv6: Preserve pervious behavior in ipv6_link_dev_addr().
ipv6: Fix result generation in ipv6_get_ifaddr().
decnet: Remove unused FIB metric macros.
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6
l2tp: Add missing semicolon to MODULE_ALIAS() in l2tp_netlink.c
l2tp: Fix L2TP_DEBUGFS ifdef tests.
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
Revert "Add non-Virtex5 support for LL TEMAC driver"
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
tcp: Set CHECKSUM_UNNECESSARY in tcp_init_nondata_skb
chelsio: Fix build warning.
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
virtio_net: Fix mis-merge.
Merge branch 'vhost' of git://git.kernel.org/.../mst/vhost
Merge branch 'master' of git://git.kernel.org/.../kaber/ipmr-2.6
Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
niu: Enable GRO by default.
tg3: Enable GRO by default.
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
tcp: Fix ipv6 checksumming on response packets for real.
tcp: Mark v6 response packets as CHECKSUM_PARTIAL
net: Orphan and de-dst skbs earlier in xmit path.
niu: Add skb->rxhash support.
Merge branch 'net-next-2.6_20100423a/br/br_multicast_v3' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-next
bridge: Fix build of ipv6 multicast code.
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
Merge branch 'master' of git://git.kernel.org/.../kaber/ipmr-2.6
net: Make RFS socket operations not be inet specific.
bridge: Use hlist_for_each_entry_rcu() in br_multicast_add_router()
Revert "bridge: Use hlist_for_each_entry_rcu() in br_multicast_add_router()"
net: Inline skb_pull() in eth_type_trans().
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
net: Use explicit "unsigned int" instead of plain "unsigned" in netdevice.h
Revert "ixgbe: disable MSI-X by default on certain Cisco adapters"
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
phy/micrel: Add module device ID table for autoloading.
Merge branch 'net-next' of git://git.kernel.org/.../vxy/lksctp-dev
forcedeth: Kill NAPI config options.
Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
Merge branch 'vhost' of git://git.kernel.org/.../mst/vhost
netpoll: Use 'bool' for netpoll_rx() return type.
microblaze: Kill NET_SKB_PAD and NET_IP_ALIGN overrides.
Revert "microblaze: Kill NET_SKB_PAD and NET_IP_ALIGN overrides."
Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
Merge branch 'master' of git://git.kernel.org/.../kaber/ipmr-2.6
Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6
Merge branch 'master' of git://git.kernel.org/.../inaky/wimax
Merge branch 'master' of master.kernel.org:/.../davem/net-2.6
Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless-next-2.6
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

David Woodhouse (2):
phylib: Support phy module autoloading
phylib: Add module table to all existing phy drivers

Dhananjay Phadke (3):
qlcnic: handle queue manager access
qlcnic: update oncard memory size check
qlcnic: fix onchip memory access

Dimitris Michailidis (9):
cxgb4: parse the VPD instead of relying on a static VPD layout
cxgb4: increase serial number length
cxgb4: set skb->rxhash
cxgb4: configure HW VLAN extraction through FW
cxgb4: report the PCIe link speed
cxgb4: report GRO stats with ethtool -S
cxgb4: fix initial addition of MAC address
cxgb4: keep interrupts available when the ports are brought down
cxgb4: notify upper drivers if the device is already up when they load

Dmitry Kravkov (1):
bnx2x: Added GRO support

Don Skidmore (2):
ixgbe: cleanup ethtool autoneg input
ixgbe: add support for active DA cables

Eddie Wai (1):
bnx2: Fix register printouts during NETEV_WATCHDOG.

Elina Pasheva (1):
NET: usb: Adding URB_ZERO_PACKET flag to usbnet.c

Emil Tantilov (3):
e1000: Use netdev_<level>, pr_<level> and dev_<level>
igb: Clean up left over prototype of igb_get_hw_dev_name()
ixgbe: fix setting of promisc mode when using mac-vlans

Eric Dumazet (63):
netfilter: nf_conntrack: per netns nf_conntrack_cachep
net: remove rcu locking from fib_rules_event()
tcp: Add SNMP counter for DEFER_ACCEPT
net: speedup netdev_set_master()
atm: Use kasprintf
net: snmp mib cleanup
net: dev_getfirstbyhwtype() optimization
rps: add CONFIG_RPS
net: __netif_receive_skb should be static
net: remove redundant code
netfilter: CLUSTERIP: clusterip_seq_stop() fix
netfilter: xt_hashlimit: RCU conversion
gen_estimator: deadlock fix
r8169: Fix rtl8169_rx_interrupt()
net: illegal_highdma() fix
icmp: Account for ICMP out errors
l2tp: unmanaged L2TPv3 tunnels fixes
net: Add a missing local_irq_enable()
net: include linux/proc_fs.h in dev_addr_lists.c
net: Dont use netdev_warn()
net: sk_dst_cache RCUification
net: uninline skb_bond_should_drop()
drivers: net: last_rx elimination
drivers: net: use skb_headlen()
net: netif_rx() must disable preemption
rps: rps_sock_flow_table is mostly read
net: remove time limit in process_backlog()
net: Introduce skb_orphan_try()
rps: shortcut net_rps_action()
rps: static functions
rps: cleanups
rps: consistent rxhash
net: sk_sleep() helper
net: Fix various endianness glitches
fasync: RCU and fine grained locking
net: Introduce skb_orphan_try()
rps: immediate send IPI in process_backlog()
dst: rcu check refinement
net: use sk_sleep()
rps: inet_rps_save_rxhash() argument is not const
net: fix a lockdep rcu warning in __sk_dst_set()
net: sk_add_backlog() take rmem_alloc into account
bnx2x: Remove two prefetch()
net: speedup udp receive path
net: ip_queue_rcv_skb() helper
net: speedup sock_recv_ts_and_drops()
net: sock_def_readable() and friends RCU conversion
net: rcu fixes
net: skb_free_datagram_locked() fix
net: __alloc_skb() speedup
net: Increase NET_SKB_PAD to 64 bytes
rps: Various optimizations
net: trans_start cleanups
net: Consistent skb timestamping
net: Introduce sk_route_nocaps
net: congestion notifications are not dropped packets
rps: avoid one atomic in enqueue_to_backlog
net: add a noref bit on skb dst
net: implements ip_route_input_noref()
net: Use ip_route_input_noref() in input path
net: No dst refcounting in ip_queue_xmit()
tcp: tcp_synack_options() fix
net: Introduce skb_tunnel_rx() helper

FUJITA Tomonori (15):
acenic: fix the misusage of zero dma address
acenic: use the dma state API instead of the pci equivalents
net: change illegal_highdma to use dma_mask
benet: use the dma state API instead of the pci equivalents
benet: fix the misusage of zero dma address
bnx2: use the dma state API instead of the pci equivalents
bnx2x: use the DMA API instead of the pci equivalents
tg3: use the DMA state API instead of the pci equivalents
qla3xxx: use the DMA state API instead of the pci equivalents
chelsio: use the DMA state API instead of the pci equivalents
cxgb3: use the DMA state API instead of the pci equivalents
qlge: use the DMA state API instead of the pci equivalents
myri10ge: use the DMA state API instead of the pci equivalents
sky2: use the DMA state API instead of the pci equivalents
skge: use the DMA state API instead of the pci equivalents

Felix Fietkau (49):
minstrel: simplify and fix debugfs code
minstrel: make the rate control ops reusable from another rc implementation
ath9k: fix rate control tx status handling for A-MPDU
mac80211: optimize tx status processing
ath9k: split out access to tx status information
ath9k: split out access to rx status information
ath9k: allocate tx and rx status information on stack
ath9k: fix compile error without debug enabled
ath9k_hw: add silicon revision macros for AR9300
ath9k_hw: add a macro for abstracting generic timer access
ath9k_hw: fix a missing hex prefix for a register mask
ath9k_hw: add simple register abstraction for some AR9300 registers
ath9k_hw: add support for GPIO differences on AR9003
ath9k_hw: Add AR9003 PHY register definitions
ath9k_hw: Set the channel on AR9003
ath9k_hw: Implement PLL control on AR9003
ath9k_hw: Implement spur mitigation on AR9003
ath9k_hw: Split off ANI control to the PHY ops
ath9k: Add Rx EDMA support
ath9k_hw: Split out the function for reading the noise floor
ath9k_hw: move AR9280 PCI EEPROM fix to eeprom_def.c
ath9k_hw: Update ath9k_hw_set_dma for AR9300
ath9k: check for specific rx stuck conditions and recover from them
ath9k: clean up tx buffer handling
ath9k: update the MCS mask for MCS16 and above
ath9k: update the ath_max_4ms_framelen table
ath9k: reduce the bits_per_symbol table size, support more streams
ath9k: initialize the number of tx/rx streams correctly
mac80211: add flags for STBC (Space-Time Block Coding)
ath9k: add support for Tx and Rx STBC
ath9k: set the STBC flag in rate control if the peer supports it
mac80211: fix handling of 4-address-mode in ieee80211_change_iface
ath9k_hw: update initvals for AR9003
ath9k_hw: fix pll clock setting for 5ghz on AR9003
ath9k_hw: fix typo in the AR9003 EEPROM data structure definition
ath9k_hw: update EEPROM data structure for AR9280
ath9k_hw: fix fast clock handling for 5GHz channels
ath9k: wake queue after processing edma rx frames
ath9k_hw: use the configured power limit for AR9003
ath9k_hw: Fix typos in tx rate power level parsing for AR9003
ath9k_hw: Fix endian bug in an AR9003 EEPROM field
ath9k_hw: fix noisefloor timeout handling on AR9003
cfg80211: add ap isolation support
mac80211: implement ap isolation support
ath9k: fix another source of corrupt frames
ath9k: use debugfs_remove_recursive() instead of keeping pointers to all entries
ath9k: add debugfs files for reading/writing the rx and tx chainmask
ath9k: add debugfs files for reading/writing registers
ath9k_hw: clean up EEPROM endian handling on AR9003

Flavio Leitner (1):
TCP: avoid to send keepalive probes if receiving data

Florian Fainelli (11):
au1000-eth: allow driver to be compiled as a module
au1000-eth: set MODULE_VERSION
au1000-eth: prefix all functions with au1000_
au1000-eth: fix checkpatch errors.
au1000-eth: implement set/get_msglevel
au1000-eth: Use (dev|netdev|netif)_<level> macro helpers
au1000-eth: bump to 1.7
r6040: use (dev|netdev)_<level> macros helpers
PHY: fix typo in bcm63xx PHY driver table
bcm63xx_enet: do not overwrite ENET_CTL_REG value
r6040: fix link checking with switches

Florian Westphal (1):
ipv6 addrlabel: permit deletion of labels assigned to removed dev

Francois Romieu (1):
via-velocity: remove private #define

Frank Blaschka (3):
qeth: l3 fix build error in ipv6 addr list handling
qeth: exploit HW TX checksumming
qeth: synchronize configuration interface

Frans Pop (16):
net: remove trailing space in messages
tipc: remove trailing space in messages
net/irda: remove trailing space in messages
net/ps3_gelic: remove trailing space in messages
net/smc91xx: remove trailing space in messages
net/tokenring: remove trailing space in messages
net/tulip: remove trailing space in messages
net/intel: remove trailing space in messages
net/various: remove trailing space in messages
wireless: remove trailing space in messages
wireless/prism54: remove trailing space in messages
wireless/raylink: remove trailing space in messages
wireless/libertas: remove trailing space in debugfs header
wireless/ipw2x00: remove trailing space in messages
iwlwifi: remove trailing space in messages
wireless/ath: remove trailing space in messages

Gertjan van Wingerde (32):
rt2x00: Disable auto wakeup before waking up device.
rt2x00: Add wakeup interrupt handler to rt61pci.
rt2x00: Add wakeup interrupt handler to rt2800pci.
rt2x00: Enable powersaving by default again on rt2500usb.
rt2x00: Let RF chipset decide the RF channel switch method to use in rt2800.
rt2x00: Update rt2800 register definitions towards latest definitions.
rt2x00: Align RT chipset definitions with vendor driver.
rt2x00: Refactor rt2800 version constants.
rt2x00: Align rt2800 register initialization with vendor driver.
rt2x00: Finish rt3070 support in rt2800 register initialization.
rt2x00: Add rt3071 support in rt2800 register initialization.
rt2x00: Add rt3090 support in rt2800 register initialization.
rt2x00: Add rt3390 support in rt2800 register initialization.
rt2x00: Remove rt2x00pci.h include from rt2800lib.
rt2x00: Enable RT30xx by default.
rt2x00: Fix HT40+/HT40- setting in rt2800.
rt2x00: Register frame length in TX entry descriptor instead of L2PAD.
rt2x00: Fix setting of txdesc->length field.
rt2x00: Clean up rt2800usb.h.
rt2x00: Don't check whether hardware crypto is enabled when reading RXD.
rt2x00: Factor out TXWI writing to common rt2800 code.
rt2x00: Factor out RXWI processing to common rt2800 code.
rt2x00: Clean up all driver's kick_tx_queue callback functions.
rt2x00: provide beacon's txdesc to write_beacon callback function.
rt2x00: Fix beaconing on rt2800.
rt2x00: Clean up generic procedures on descriptor writing.
rt2x00: Consistently name skb frame descriptor skbdesc.
rt2x00: Fix beacon descriptor writing for rt61pci.
rt2x00: Re-order tx descriptor writing code in drivers.
rt2x00: Simplify TXD handling of beacons.
rt2x00: Dump beacons under a different identifier than TX frames.
rt2x00: In debugfs frame dumping allow the TX descriptor to be part of the skb.

Giuseppe CAVALLARO (7):
stmmac: split core and dma for the mac10/100
stmmac: rework normal and enhanced descriptors
stmmac: fix Transmit FIFO flush operation
stmmac: new descriptor field for the driver's platform
stmmac: get the descriptor structure from platform
stmmac: fix vlan support setup
stmmac: updated the drv module version

Grazvydas Ignotas (7):
wl1251: make local symbols static
wl1251: fix ELP_CTRL register accesses when using SDIO
wl1251: reduce eeprom read wait time
wl1251: don't require NVS data when EEPROM is used
wl1251: read default MAC address from EEPROM when available
wl1251: register platform_device to pass board data
wl1251: add support for dedicated IRQ line

Greg Rose (6):
ixgbevf: Fix link speed display
ixgbe: Add boolean parameter to ixgbe_set_vmolr
ixgbe: Add support for VF MAC and VLAN configuration
ixgbe: Remove unneeded register writes in VF VLAN setup
ixgbe: Streamline MC filter setup for VFs
ixgbevf: Cache PF ack bit in interrupt

Gustavo F. Padovan (54):
Bluetooth: Fix return value when bt_skb_alloc fails
Bluetooth: Use the proper function cast to get hdr data
Bluetooth: Fix wrong packet type count increment
Bluetooth: Make hci_send_sco() void
Bluetooth: Trivial clean ups to SCO
Bluetooth: Move specific Basic Mode code to the right place
Bluetooth: Fix memory leak of S-frames into L2CAP
Bluetooth: Fix expected_tx_seq calculation on L2CAP
Bluetooth: Fix ACL MTU issue
Bluetooth: Use a l2cap_pinfo struct instead l2cap_pi() macro
Bluetooth: Implement 'Send IorRRorRNR' event
Bluetooth: Support case with F bit set under WAIT_F state.
Bluetooth: Check the minimum {I,S}-frame size into L2CAP
Bluetooth: Check if SDU size is greater than MTU on L2CAP
Bluetooth: Implement SendAck() Action on ERTM.
Bluetooth: Move set of P-bit to l2cap_send_sframe()
Bluetooth: Add Recv RR (P=0)(F=0) for SREJ_SENT state on ERTM
Bluetooth: Split l2cap_data_channel_sframe()
Bluetooth: Handle all cases of receipt of RNR-frames into L2CAP
Bluetooth: Group the ack of I-frames into l2cap_data_channel_rrframe()
Bluetooth: Remove duplicate use of __get_reqseq() macro on L2CAP
Bluetooth: Finish implementation for Rec RR (P=1) on ERTM
Bluetooth: Add timer to Acknowledge I-frames
Bluetooth: Ignore Tx Window value with Streaming mode
Bluetooth: Read RFC conf option on a successful Conf RSP
Bluetooth: Fix configuration of the MPS value
Bluetooth: Add le16 macro to Retransmission and Monitor Timeouts values
Bluetooth: Check the SDU size against the MTU value
Bluetooth: Send Ack after clear the SREJ list
Bluetooth: Add sockopt configuration for txWindow on L2CAP
Bluetooth: Change acknowledgement to use the value of txWindow
Bluetooth: Add module parameter for txWindow size on L2CAP
Bluetooth: Enable option to configure Max Transmission value via sockopt
Bluetooth: Fix bug when retransmitting I-frames
Bluetooth: Fix crash when monitor timeout expires
Bluetooth: Fix drop of acked packets on ERTM
Bluetooth: Optimize SREJ_QUEUE append
Bluetooth: Add Kconfig option for L2CAP Extended Features
Bluetooth: Add SOCK_STREAM support to L2CAP
Bluetooth: Fix SDU reassembly under SREJ
Bluetooth: Don't set control bits to zero first
Bluetooth: Fix errors reported by checkpatch.pl
Bluetooth: Remove set of SrejSaveReqSeq under receipt of REJ frame
Bluetooth: Remove unneeded control vars
Bluetooth: Check if we really are in WAIT_F when F bit comes
Bluetooth: Fix lockdep annotation on ERTM
Bluetooth: Make hci_send_acl() void
Bluetooth: Refactor l2cap_retransmit_frame()
Bluetooth: Implement missing parts of the Invalid Frame Detection
Bluetooth: Implement Local Busy Condition handling
Bluetooth: Add wait_queue to wait ack of all sent packets
Bluetooth: Fix race condition on l2cap_ertm_send()
Bluetooth: Prevents buffer overflow on l2cap_ertm_reassembly_sdu()
Bluetooth: Fix spec error in the RemoteBusy Logic

Hagen Paul Pfeifer (4):
tipc: define needless global scoped variable static
sctp: eliminate useless code
ipv4: remove redundant verification code
socket: remove duplicate declaration of struct timespec

Hans J. Koch (1):
Fix some #includes in CAN drivers (rebased for net-next-2.6)

Hans de Goede (1):
p54pci: fix regression from prevent stuck rx-ring on slow system

Hauke Mehrtens (1):
wireless: Fix merge.

Helmut Schaa (14):
mac80211: Improve software scan timing
rt2x00: fix warning when building rt2800pci with just soc support
rt2x00: use rt2800_config_channel_rt3x for rt2872
rt2x00: add txdesc parameter to write_tx_data
rt2x00: rt2800pci: fix tx path by not accessing the skb after it was DMA mapped
rt2x00: rt2800lib: disable HT40 for now as it causes reception problems
rt2x00: rt2800: use tx_power2 in rt2800_config_channel_rf3xxx
rt2x00: fix typo in rt2800.h
rt2x00: rt2800lib: Fix rx path on SoC devices
rt2x00: rt2800lib: Remove redundant check for RT2872
rt2x00: rt2800lib: update rfcsr & bbp init code for SoC devices
rt2x00: rt2800: update initial SIFS values
rt2x00: rt2800: don't overwrite SIFS values on erp changes
rt2x00: rt2800: use correct txop value in tx descriptor

Herbert Xu (11):
xfrm: Remove xfrm_state_genid
netfilter: only do skb_checksum_help on CHECKSUM_PARTIAL in ip_queue
netfilter: only do skb_checksum_help on CHECKSUM_PARTIAL in ip6_queue
netfilter: only do skb_checksum_help on CHECKSUM_PARTIAL in nfnetlink_queue
tcp: Handle CHECKSUM_PARTIAL for SYNACK packets for IPv4
tcp: Handle CHECKSUM_PARTIAL for SYNACK packets for IPv6
inet: Remove unused send_check length argument
ipv6: Replace inet6_ifaddr->dead with state
ipv6: Use state_lock to protect ifa state
ipv6: Use POSTDAD state
ipv6: Never schedule DAD timer on dead address

Holger Schurig (2):
mac80211: sample survey implementation for mac80211 & hwsim
ath5k: basic support for survey

Huang Weiyi (1):
net: remove unused #include <linux/version.h>

Ilpo Järvinen (1):
unix/garbage: kill copy of the skb queue walker

Inaky Perez-Gonzalez (2):
wimax/i2400m: driver defaults to firmware v1.5 for i5x50 devices
wimax/i2400m: driver defaults to firmware v1.5 for i6x60 devices

Ivo van Doorn (1):
rt2x00: Fix RF3052 channel initialization

James Chapman (14):
l2tp: Relocate pppol2tp driver to new net/l2tp directory
l2tp: Split pppol2tp patch into separate l2tp and ppp parts
ppp: Add ppp_dev_name() exported function
l2tp: Add ppp device name to L2TP ppp session data
l2tp: Add L2TPv3 protocol support
l2tp: Update PPP-over-L2TP driver to work over L2TPv3
l2tp: Add L2TPv3 IP encapsulation (no UDP) support
netlink: Export genl_lock() API for use by modules
l2tp: Add netlink control API for L2TP
l2tp: Convert rwlock to RCU
l2tp: Add L2TP ethernet pseudowire support
l2tp: Add debugfs files for dumping l2tp debug info
l2tp: Add support for static unmanaged L2TPv3 tunnels
l2tp: Update documentation

Jan Engelhardt (64):
net: tcp: make hybla selectable as default congestion module
net: tcp: make veno selectable as default congestion module
net: core: add IFLA_STATS64 support
netfilter: xt_CT: par->family is an nfproto
netfilter: xt_NFQUEUE: consolidate v4/v6 targets into one
netfilter: xtables: add comment markers to Xtables Kconfig
netfilter: xtables: merge xt_MARK into xt_mark
netfilter: xtables: merge xt_CONNMARK into xt_connmark
netfilter: xtables: schedule xt_NOTRACK for removal
netfilter: update my email address
netfilter: ebt_ip6: add principal maintainer in a MODULE_AUTHOR tag
netfilter: xt_recent: update description
netfilter: xt_recent: remove old proc directory
netfilter: xtables: do without explicit XT_ALIGN
netfilter: xtables: clean up xt_mac match routine
netfilter: xtables: limit xt_mac to ethernet devices
netfilter: xtables: resort osf kconfig text
netfilter: xtables: make use of caller family rather than match family
netfilter: update documentation fields of x_tables.h
netfilter: xtables: remove almost-unused xt_match_param.data member
netfilter: xtables: reduce holes in struct xt_target
netfilter: xtables: do not print any messages on ENOMEM
netfilter: xtables: replace custom duprintf with pr_debug
netfilter: xt extensions: use pr_<level>
netfilter: xtables: make use of caller family rather than target family
netfilter: xt extensions: use pr_<level> (2)
netfilter: xtables: make use of xt_request_find_target
netfilter: xtables: consolidate code into xt_request_find_match
netfilter: xt_recent: allow changing ip_list_[ug]id at runtime
netfilter: bridge: use NFPROTO values for NF_HOOK invocation
netfilter: ipv4: use NFPROTO values for NF_HOOK invocation
netfilter: ipv6: use NFPROTO values for NF_HOOK invocation
netfilter: decnet: use NFPROTO values for NF_HOOK invocation
netfilter: ipvs: use NFPROTO values for NF_HOOK invocation
netfilter: xtables: untangle spaghetti if clauses in checkentry
netfilter: xtables: change xt_match.checkentry return type
netfilter: xtables: change xt_target.checkentry return type
netfilter: xtables: change matches to return error code
netfilter: xtables: change targets to return error code
netfilter: xtables: slightly better error reporting
netfilter: xtables: shorten up return clause
netfilter: xtables: remove xt_hashlimit revision 0
netfilter: xtables: remove xt_multiport revision 0
netfilter: xtables: remove xt_string revision 0
netfilter: xtables: merge registration structure to NFPROTO_UNSPEC
net: fix unaligned access in IFLA_STATS64
net: increase preallocated size of nlmsg to accomodate for IFLA_STATS64
netfilter: ipv6: move POSTROUTING invocation before fragmentation
netfilter: ipv6: add IPSKB_REROUTED exclusion to NF_HOOK/POSTROUTING invocation
netfilter: xtables: inclusion of xt_TEE
netfilter: xtables: make ip_tables reentrant
netfilter: xt_TEE: have cloned packet travel through Xtables too
netfilter: xtables: remove old comments about reentrancy
netfilter: x_tables: move sleeping allocation outside BH-disabled region
netfilter: x_tables: rectify XT_FUNCTION_MAXNAMELEN usage
netfilter: ip_tables: fix compilation when debug is enabled
netfilter: xtables: fix incorrect return code
netfilter: xtables: dissolve do_match function
netfilter: xtables: combine struct xt_match_param and xt_target_param
netfilter: xtables: substitute temporary defines by final name
netfilter: xtables: deconstify struct xt_action_param for matches
netfilter: xtables: change hotdrop pointer to direct modification
netfilter: xtables: combine built-in extension structs
netfilter: xtables: add missing depends for xt_TEE

Jason Gunthorpe (1):
NET: Support clause 45 MDIO commands at the MDIO bus level

Javier Cardona (1):
mac80211: Moved mesh action codes to a more visible location

Jay Sternberg (1):
iwlwifi: enable '6000 Series 2x2 AGN Gen2' adaptors

Jesper Dangaard Brouer (1):
netfilter: nf_conntrack: extend with extra stat counter

Jesse Brandeburg (7):
e1000e: use static params to save stack space
ixgbe: fix bug with vlan strip in promsic mode
ixgbe: enable extremely low latency
ixgbe: fix bug when EITR=0 causing no writebacks
e1000/e1000e: implement a simple interrupt moderation
e1000: fix WARN_ON with mac-vlan
e1000: cleanup unused parameters

Jiri Pirko (20):
net: convert multiple drivers to use netdev_for_each_mc_addr, part7
net: rename notifier defines for netdev type change
bonding: check return value of nofitier when changing type
net: forbid underlaying devices to change its type
bonding: flush unicast and multicast lists when changing type
ipoib: remove addrlen check for mc addresses
ixgbe: convert to use netdev_for_each_mc_addr
ixgbevf: convert to use netdev_for_each_mc_addr
netfilter: ctnetlink: compute message size properly
net: move address list functions to a separate file
net: convert multicast list to list_head
net: emphasize rtnl lock required in call_netdevice_notifiers
l2tp: fix memory allocation
l2tp_eth: fix memory allocation
netns: rename unregister_pernet_subsys parameter
phonet: use phonet_pernet instead of directly net_generic
pppoe: use pppoe_pernet instead of directly net_generic
net: disallow to use net_assign_generic externally
pppoe: remove unnecessary checks in pppoe_flush_dev
net: adjust handle_macvlan to pass port struct to hook

Joe Perches (24):
netfilter: net/netfilter/ipvs/ip_vs_ftp.c: Remove use of NIPQUAD
drivers/net/ks*: Use netdev_<level>, netif_<level> and pr_<level>
drivers/net/e100.c: Use pr_<level> and netif_<level>
ixgbevf: Message formatting fixup
include/linux/wireless.h: Add IW_HANDLER macro to initialize array entry
wireless.h: Use SIOCIWFIRST not SIOCSIWCOMMIT for range check
net/wireless/wext_core.c: Use IW_IOCTL_IDX macro
net/wireless/wext-core.c: Use IW_EVENT_IDX macro
drivers/net/wireless: Use IW_HANDLER macro
drivers/net: Remove local #define IW_IOCTL, use IW_HANDLER
orinoco/wext.c: Remove local #define STD_IW_HANDLER
drivers/net/wireless/ray_cs.c: Use iw_handler function prototypes
e1000e: typo corrections
drivers/net/ipg: Remove invalid IPG_DDEBUG_MSG uses, neaten
MAINTAINERS: ipg: Jesse Huang's email address bounces
include/net/iw_handler.h: Use SIOCIWFIRST not SIOCSIWCOMMIT in comment
net/l2tp/l2tp_debugfs.c: Convert NIPQUAD to %pI4
ixgb: Use pr_<level> and netdev_<level>
netfilter: remove unnecessary returns from void function()s
drivers/net: Remove unnecessary returns from void function()s
ixgb and e1000: Use new function for copybreak tests
net: Remove unnecessary semicolons after switch statements
drivers/net: remove useless semicolons
net: Remove unnecessary returns from void function()s

Johannes Berg (95):
mac80211: deprecate RX status noise
mac80211: use different MAC addresses for virtual interfaces
iwlagn: move ICT code into separate file
iwlwifi: move 3945 specific data into union
iwlwifi: move ICT data to agn part of union
iwlagn: remove write-only variables
iwlwifi: remove superfluous channel check
iwlwifi: remove dead code from iwl_mac_reset_tsf
iwlwifi: remove frame dropping
iwlwifi: remove never-changing priv->rates_mask variable
iwlwifi: remove priv->active_rate_basic
iwlwifi: remove IBSS channel sanity check
iwlwifi: remove sanity check
iwlwifi: clear up AC/FIFO debug output
iwlwifi: move 3945 clip groups to 3945 data
iwlwifi: remove alive start adhoc restart
iwlwifi: remove STATUS_MODE_PENDING
iwlagn: move sysfs flags and filter_flags files to debugfs
iwlwifi: change WEP key protection to use mutex
iwlwifi: clean up queue/fifo handling
iwlwifi: sta_id cannot be invalid in rs_initialize_lq
iwlwifi: remove noise reporting
mac80211: fix station destruction problem
mac80211: remove irq disabling for sta lock
mac80211: remove ieee80211_sta_stop_rx_ba_session
mac80211: rename WLAN_STA_SUSPEND to WLAN_STA_BLOCK_BA
mac80211: clean up/fix aggregation code
mac80211: fix some RX aggregation locking
mac80211: fix paged RX crypto
mac80211: enhance tracing
iwlwifi: make WEP key restoring explicit
iwlwifi: remove wrong key use check
iwlagn: simplify WEP key check
iwlwifi: remove pointless sta_id invalid check
iwlwifi: clean up last_phy_res
iwlwifi: remove scan_bands logic
iwlwifi: correct atomic bitops usage
iwlwifi: remove next_scan_jiffies
iwlwifi: remove scan_pass_start
iwlwifi: rename priv->scan to priv->scan_cmd
iwlwifi: trigger scan synchronously
iwlwifi: make BT coex config a virtual method
iwlwifi: rename TX_CMD_FLG_BT_DIS_MSK
iwlwifi: don't check monitor for scanning
iwlwifi: remove monitor check
iwlwifi: make scan antenna forcing more generic
mac80211: fix stopping RX BA session from timer
mac80211: add missing newline
radiotap parser: fix endian annotation
ethernet: print protocol in host byte order
mac80211: give virtual interface to hw_scan
mac80211: notify driver about IBSS status
mac80211: tell driver about IBSS merge
mac80211: fix ieee80211_find_sta[_by_hw]
mac80211: allow controlling aggregation manually
mac80211: improve IBSS scanning
mac80211_hwsim: fix double-scan detection
mac80211: use fixed channel in ibss join when appropriate
mac80211: fix BSS info reconfiguration
cfg80211/mac80211: better channel handling
mac80211: improve HT channel handling
iwlagn: wait for asynchronous firmware loading
iwlwifi: use vif iwl_bss_info_changed
iwl3945: use iwl3945_add_bcast_station
iwlwifi: pass address to iwl_remove_station
iwlwifi: manage IBSS station properly
iwlagn: show and store firmware build number
iwl3945: remove ucode access indirection
iwlwifi: remove ucode virtual functions
iwlwifi: move eeprom version printout to eeprom init
iwlagn: prepare for new firmware file format
iwlagn: implement loading a new firmware file type
iwlwifi: remove rts_threshold
iwlagn: move iwl_get_ra_sta_id to 4965
iwlagn: use vif->type to check station
iwlwifi: apply filter flags directly
iwlwifi: push virtual interface through
iwlagn: use virtual interface in TX aggregation handling
iwlwifi: remove useless priv->vif check
iwlwifi: use vif in iwl_ht_conf
iwlwifi: note that priv->bssid is used only by 3945
iwlwifi: fix iwl_sta_init_lq station ID
iwlwifi: split allocation/sending local station LQ
iwlwifi: rework broadcast station management
iwlwifi: track station IDs
iwlwifi: add iwl_sta_id()
iwlwifi: use iwl_find_station less
iwlagn: use iwl_sta_id() for aggregation
iwlwifi: use iwl_sta_id() for TKIP key update
iwlwifi: move iwl_find_station() to 4965
iwlwifi: rename iwl_add_local_station
iwlwifi: remove pointless HT check
iwlwifi: clear driver stations when going down
mac80211: don't process work item with wrong frame
mac80211: add offload channel switch support

John Fastabend (3):
ixgbe: ixgbe_down needs to stop dev_watchdog
ixgbe: fix ixgbe_tx_is_paused logic
ixgbe: dcb, do not tag tc_prio_control frames

John Linn (3):
Add non-Virtex5 support for LL TEMAC driver
net: ll_temac: remove virt_to_bus call
Add non-Virtex5 support for LL TEMAC driver

John W. Linville (46):
ath5k: remove some dead functions
ath5k: remove dead source in ath5k_combine_linear_pcdac_curves
ath5k: remove unused beacon timer code
Revert "mac80211: fix rates setup on IBSS merge"
Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
iwlwifi: fix build error for CONFIG_IWLAGN=n
Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 into merge
ath5k: fixup some merge damage for AR5211 IQ calibration
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
Merge branch 'master' into for-davem
ssb: do not read SPROM if it does not exist
MAINTAINERS: add entry for include/linux/iw_handler.h
mwl8k: remove usage of deprecated noise value
ar9170: remove usage of deprecated noise value
ath5k: remove usage of deprecated noise value
ath9k: remove usage of deprecated noise value
b43: remove usage of deprecated noise value
b43legacy: remove usage of deprecated noise value
libertas_tf: remove usage of deprecated noise value
p54: remove usage of deprecated noise value
rt2x00: remove usage of deprecated noise value
wl1251: remove usage of deprecated noise value
rtl8180: use cached queue mapping for skb in rtl8180_tx
rtl8180: fix tx status reporting
libertas_tf: avoid warning about pr_fmt redefinition
mac80211: remove deprecated noise field from ieee80211_rx_status
iwmc3200wifi: cleanup unneeded debugfs error handling
rt2x00: remove now unused noise field from struct rxdone_entry_desc
b43: Added get_survey callback in order to get channel noise
b43legacy: Added get_survey callback in order to get channel noise
Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
iwmc3200wifi: fix busted iwm_debugfs_init definition
rtl8180: use SET_IEEE80211_PERM_ADDR
rtl8187: use SET_IEEE80211_PERM_ADDR
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
mac80211: set IEEE80211_TX_CTL_FIRST_FRAGMENT for beacons
rtl8180: assign sequence numbers in the driver
rtl8180: add software-based support for IBSS mode
rtl8180: change PCI DMA mask to DMA_BIT_MASK(32)
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem

Jon Paul Maloy (1):
TIPC: Updated topology subscription protocol according to latest spec

Jonas Sjöquist (1):
cdc_ether: Identify MBM devices by GUID in MDLM descriptor

Jouni Malinen (8):
mac80211: Track Beacon signal strength and implement cqm events
mac80211: Send deauth/disassoc prior to dropping STA entry
mac80211: Fix BIP to be used only with group-addressed frames
mac80211: Fix dropping of unprotected robust multicast frames
ath9k: Do not indicate RX_FLAG_DECRYPTED for unprotected frames
mac80211: Fix drop_unencrypted for MFP with hwaccel
mac80211: Fix robust management frame handling (MFP)
cfg80211: Add local-state-change-only auth/deauth/disassoc

João Paulo Rechi Vita (3):
Bluetooth: Check if mode is supported on getsockopt
Bluetooth: Close L2CAP channel on invalid ReqSeq
Bluetooth: Completes the I-frame tx_seq check logic on RECV

Julia Lawall (9):
drivers/net/wireless/hostap: Drop memory allocation cast
drivers/net/usb: Use kmemdup
drivers/net/usb: Use kmemdup
drivers/net/usb: Use kmemdup
drivers/s390/net: Drop memory allocation cast
drivers/net: Use kzalloc
net/caif: Use kzalloc
drivers/net/vmxnet3: Use kzalloc
drivers/net: Use kcalloc or kzalloc

Jussi Kivilinna (4):
rndis_wlan: copy only useful data from rndis_command respond
rndis_wlan: remove unused variables from priv structure
rndis_wlan: get max_num_pmkids from device
rndis_wlan: Implement cfg80211 PMKSA API

Juuso Oikarinen (63):
wl1271: Improvements to the TX path
wl1271: Fix ad-hoc mode neighborhood detection
wl1271: Fix queue stopping/waking for TX path
wl1271: Remove annoying PSM entry/exit kernel traces
wl1271: Aggregate RX acknowledgements to FW
wl1271: Don't mask interrupts while handling interrupt
wl1271: Implement looped IRQ handling
wl1271: Update TX packet life time handling with higher resolution time
wl1271: Clean up firmware block allocation calculation
wl1271: Clean up TX security sequence number handling
wl1271: Disable host TX rate control
wl1271: Remove tx-power level workaround
wl1271: Fix configuration of the TX opportunity value
wl1271: Fix SG configuration message structures
wl1271: Add proper WLAN-BT co-ex configuration, and enable co-ex.
wl1271: Move platform device registration from _spi to _main
wl1271: Add sysfs file to control BT co-ex state
wl1271: Fix MAC address handling
wl1271: Remove deprecated interface config function
wl1271: Update filters properly
wl1271: Don't generate null func template for ad-hoc
wl1271: Remove circular interlocking related to the inetaddr notifier chain
mac80211: Add support for connection monitor in hardware
cfg80211: Add connection quality monitoring support to nl80211
mac80211: Add support for connection quality monitoring
cfg80211: Improve connection quality maintenance docs in nl80211.h
wl1271: Clean up RX rate reporting
wl1271: Add TX rate reporting
wl1271: Fix memory leaks in SPI initialization
wl1271: Fix memory leak in scan command handling
wl1271: Configure clock-request drive mode to open-drain
wl1271: Fix memory leak in cmd_data_path
wl1271: Update busyword checking mechanism
wl1271: Remove device MAC-address randomization
wl1271: Disable connection monitoring while not associated
wl1271: Fix ad-hoc mode handling
wl1271: Update beacon interval properly for ad-hoc
wl1271: Fix memory leak in firmware crash scenario
wl1271: Configure probe-request template when associated
wl1271: Disconnect if PSM entry fails
wl1271: Configure HW connection monitor
wl1271: Add keep-alive frame template support
wl1271: Enable hardware keep alive messages
wl1271: Fix keep-alive related command error
wl1271: Use minimum rate for each band for control messages
wl1271: Configure rates for templates
wl1271: Configure a higher listen interval to AP upon association
wl1271: Fix debug prints for beacon-loss and psm-entry-fail scenarios
wl1271: Fix tx queue flushing
wl1271: Fix memory leaks on driver initialization
wl1271: Go to ELP in idle
wl1271: Add support for connection quality monitoring
mac80211: Prevent running sta_cleanup timer unnecessarily
mac80211: Fix ieee80211_sta_conn_mon_timer with hw connection monitoring
mac80211: Fix sta->last_tx_rate setting with no-op rate control devices
mac80211: Determine dynamic PS timeout based on ps-qos network latency
cfg80211: Remove default dynamic PS timeout value
wl1271: Improve command polling
wl1271: Rewrite hardware keep-alive handling
wl1271: Add sysfs file to retrieve HW PG-version and ROM-version
wl1271: Fix 32 bit register read related endiannes bug
wl1271: Fix to join and channel number handling
wl1271: Reduce PSM entry hang over period from 128 => 1 ms

Kalle Valo (8):
wl1271: don't get received frames from hardware in PLT mode
wl1271: enable WMM
wl1271: get pspoll and nullfunc templates from mac80211
wl1271: get probe request template from mac80211
wl1271: create qos nullfunc template
wl1271: fix ps scheme in wl1271_op_conf_tx()
wl1271: enable U-APSD
wl1251: use DRIVER_NAME macro in wl1251_spi_driver

Koki Sanagi (2):
igb: double increment nr_frags
igbvf: double increment nr_frags

Kuninori Morimoto (3):
net/irda: sh_sir: fixup err return value on sh_sir_open
net/irda: sh_sir: Modify iounmap wrong execution
net/irda: Add SuperH IrDA driver support

Larry Finger (3):
ssb: Export ssb_chipco_gpio_control - needed by N PHY code
rtl818x: Move configuration details to the rtl818x directory
ssb: Make bus registration failure not be silent

Luciano Coelho (7):
wl1271: fix wl1271_spi driver name
wl1271: wait for join command complete event
wl1271: wait for disconnect command complete event
wl1271: remove deprecated usage of RX status noise
wl1271: fix sdio driver name in wl1271_sdio_driver
wl1271: added missing command header in wl1271_cmd_disconnect
wl1271: fix a bunch of sparse warnings

Luis Correia (1):
rt2x00: remove MCU requests for SoC platforms

Luis R. Rodriguez (64):
mac80211_hwsim: add sw_scan sw_scan_complete
mac80211: fix typo for LDPC capability
ath9k_hw: start building an abstraction layer for hardware routines
ath9k_hw: AR9003 does not have AR_RC_AHB skip its setting
ath9k_hw: remove wrapper ath9k_hw_write_regs()
ath9k_hw: Move some RF ops to the private callbacks
ath9k_hw: skip PLL initialization on AR9003 on Power-On-Reset
ath9k_hw: add some comments for ath9k_set_power_network_sleep()
ath9k_hw: add a private callback for PLL control computation
ath9k_hw: Add AR9003 PHY support
ath9k_hw: move init config and default after chip is up
ath9k_hw: add the AR9003 ar9003_hw_macversion_supported()
ath9k_hw: disable ANI for AR9003
ath9k: disable the MIB interrupt if ANI is disabled
ath9k_hw: add common channel select helpers for ar900[23]
ath9k_hw: split initvals.h by hardware family
ath9k_hw: add initvals for the AR9003 hardware family
ath9k_hw: add helpers for processing the AR9003 INI
ath9k_hw: add all the AR9003 PHY callbacks
ath9k_hw: add a helper for Power Amplifier calibration for AR9002
ath9k_hw: add a helper for the OLC tem compensation for AR9002
ath9k_hw: rename PA calib for AR9287
ath9k_hw: shift code for AR9280 OLC temp comp
ath9k_hw: move the AR9280 OLC temp comp to its own helper
ath9k_hw: simplify OLC temp compensation for AR9002
ath9k_hw: rename the PA calib routines to match their families
ath9k_hw: rename getNoiseFloorThresh() to ath9k_hw_loadnf()
ath9k_hw: move the cal AR9100 calibration settings
ath9k_hw: split calib code by hardware families
ath9k_hw: add the AR9003 ar9003_hw_init_cal callback
ath9k_hw: add the config_pci_powersave AR9003 callback
ath9k_hw: split the generic hardware code by hardware family
ath9k_hw: move the cck channel 14 INI to the AR9002 hw code
ath9k_hw: move TX/RX gain INI stuff to its own hardware family code
ath9k_hw: abstract the AR_PHY_AGC_CONTROL register access
ath9k_hw: abstract loading noisefloor
ath9k_hw: fill in the callbacks for calibration for AR9003
ath9k_hw: complete AR9003 calibration
ath9k_hw: rename eep_AR9287_ops to eep_ar9287_ops
ath9k_hw: restore mac address reading logic
ath9k_hw: add OFDM spur mitigation for AR9003
ath9k_hw: move the RF claim stuff to AR9002 hardware family
ath9k_hw: add the AR9300 SREV hw name print
ath9k_hw: add TX/RX gain register initialization for AR9003
ath9k_hw: skip asynch fifo enablement to AR9003
ath9k_hw: skip WEP aggregation enable code for AR9003
ath9k_hw: move AR9002 mac ops to its own file
ath9k: add RXLP and RXHP to debugfs counters
ath9k_hw: enable CRC check of descriptors for AR9003
ath9k_hw: set cwmin and cwmax to 0 for for AR9003 upon txq reset
mac80211: add LDPC control flag
ath9k_hw: add LDPC support for AR9003
ath9k: add LDPC support
ath9k_hw: add the PCI ID for the first AR9300 device
ath9k_hw: make two initvals consto for the AR9001 family
ath9k_hw: make all AR9002 initvals use u32
ath9k_hw: disable TX IQ calibration for AR9003
ath9k_hw: Fix TX interrupt mitigation settings
ath9k_common: move the rate status setting into ath9k_process_rate()
ath9k_common: drop incomming frames with an invalid hardware rate
ath9k_hw: Update initvals for AR9003 for xb113
ath9k_hw: enable PCIe low power mode for AR9003
ath5k: drop warning on jumbo frames
ath9k_hw: new initialization values for AR9003

Luis de Bethencourt (3):
Net: wireless: ath: fix macros coding style issue in hw.c
ath: fix code readability in regd.c
ath: fix coding style/readability in ath/ar9