alistair23-linux/drivers/staging
Linus Torvalds 3b59bf0816 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Pull networking merge from David Miller:
 "1) Move ixgbe driver over to purely page based buffering on receive.
     From Alexander Duyck.

  2) Add receive packet steering support to e1000e, from Bruce Allan.

  3) Convert TCP MD5 support over to RCU, from Eric Dumazet.

  4) Reduce cpu usage in handling out-of-order TCP packets on modern
     systems, also from Eric Dumazet.

  5) Support the IP{,V6}_UNICAST_IF socket options, making the wine
     folks happy, from Erich Hoover.

  6) Support VLAN trunking from guests in hyperv driver, from Haiyang
     Zhang.

  7) Support byte-queue-limtis in r8169, from Igor Maravic.

  8) Outline code intended for IP_RECVTOS in IP_PKTOPTIONS existed but
     was never properly implemented, Jiri Benc fixed that.

  9) 64-bit statistics support in r8169 and 8139too, from Junchang Wang.

  10) Support kernel side dump filtering by ctmark in netfilter
      ctnetlink, from Pablo Neira Ayuso.

  11) Support byte-queue-limits in gianfar driver, from Paul Gortmaker.

  12) Add new peek socket options to assist with socket migration, from
      Pavel Emelyanov.

  13) Add sch_plug packet scheduler whose queue is controlled by
      userland daemons using explicit freeze and release commands.  From
      Shriram Rajagopalan.

  14) Fix FCOE checksum offload handling on transmit, from Yi Zou."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1846 commits)
  Fix pppol2tp getsockname()
  Remove printk from rds_sendmsg
  ipv6: fix incorrent ipv6 ipsec packet fragment
  cpsw: Hook up default ndo_change_mtu.
  net: qmi_wwan: fix build error due to cdc-wdm dependecy
  netdev: driver: ethernet: Add TI CPSW driver
  netdev: driver: ethernet: add cpsw address lookup engine support
  phy: add am79c874 PHY support
  mlx4_core: fix race on comm channel
  bonding: send igmp report for its master
  fs_enet: Add MPC5125 FEC support and PHY interface selection
  net: bpf_jit: fix BPF_S_LDX_B_MSH compilation
  net: update the usage of CHECKSUM_UNNECESSARY
  fcoe: use CHECKSUM_UNNECESSARY instead of CHECKSUM_PARTIAL on tx
  net: do not do gso for CHECKSUM_UNNECESSARY in netif_needs_gso
  ixgbe: Fix issues with SR-IOV loopback when flow control is disabled
  net/hyperv: Fix the code handling tx busy
  ixgbe: fix namespace issues when FCoE/DCB is not enabled
  rtlwifi: Remove unused ETH_ADDR_LEN defines
  igbvf: Use ETH_ALEN
  ...

Fix up fairly trivial conflicts in drivers/isdn/gigaset/interface.c and
drivers/net/usb/{Kconfig,qmi_wwan.c} as per David.
2012-03-20 21:04:47 -07:00
..
android Staging: android: ram_console.c: 2012-03-15 16:38:14 -07:00
asus_oled staging: asus_oled: Remove superfluous loop 2012-02-29 15:43:21 -08:00
bcm Staging: bcm: fix possible memory leak of 'pstAddIndication' in CmHost.c and removes a whitespace 2012-03-02 16:36:55 -08:00
comedi staging/comedi/drivers fix spelling errors 2012-03-09 13:14:08 -08:00
cptm1217
crystalhd staging: crystalhd: Fix typo in crystalhd_hw.c 2012-03-08 09:57:38 -08:00
cxt1e1
echo
et131x Staging: et131x: unify return value of .ndo_set_mac_address if address is invalid 2012-02-24 12:03:13 -08:00
frontier Staging: frontier: Fix checkpatch.pl issue. 2012-02-24 12:03:12 -08:00
ft1000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-03-20 21:04:47 -07:00
iio staging:iio:tsl2563 rewrite probe error handling 2012-03-07 13:36:45 -08:00
keucr USB merge for 3.4-rc1 2012-03-20 11:26:30 -07:00
line6
media Staging: media: lirc: lirc_sasem.c: fixed long line coding style issue 2012-02-29 15:52:53 -08:00
mei staging: mei: remove driver internal versioning 2012-03-14 12:17:45 -07:00
nvec
octeon staging/octeon: Fix PHY binding in octeon-ethernet driver. 2012-02-24 12:03:15 -08:00
olpc_dcon
omapdrm staging: drm/omap: use current time for page-flip event 2012-03-13 15:44:44 -07:00
ozwpan staging: ozwpan depends on NET 2012-03-14 12:14:26 -07:00
panel
phison
quatech_usb2 USB: serial: quatech_usb2.c: use module_usb_serial_driver 2012-02-28 13:11:27 -08:00
quickstart Staging: quickstart: Fix compilation warning on 64 bit arch 2012-02-13 20:08:56 -08:00
ramster staging: ramster: Dont build ramster when CONFIGFS_FS=m 2012-02-24 11:59:58 -08:00
rtl8187se Staging: rtl8187se: r8180_wx.c: Cleaned up comments 2012-03-15 16:46:55 -07:00
rtl8192e Staging, rtl8192e, softmac: remove redundant memset and fix mem leak 2012-02-15 17:21:43 -08:00
rtl8192u Staging: rtl8712/rtl8192u: move USB device ID within staging drivers. 2012-03-02 16:36:38 -08:00
rtl8712 staging: r8712u: Fix Smatch warning 2012-03-07 13:36:45 -08:00
rts5139 staging: Update TODO for rts5139 and rts_pstor 2012-02-24 12:03:14 -08:00
rts_pstor staging: Update TODO for rts5139 and rts_pstor 2012-02-24 12:03:14 -08:00
sbe-2t3e3 Staging: sbe-2t3e3: logical || vs bitwise | 2012-02-09 09:51:17 -08:00
sep staging: Fix SEP build 2012-02-13 14:42:02 -08:00
serial
serqt_usb2 USB: serial: serqt_usb2.c: use module_usb_serial_driver 2012-02-28 13:11:30 -08:00
slicoss staging: clean up Greg's email address in some TODO files 2012-02-15 14:45:40 -08:00
sm7xx Staging: sm7xx/smtcfb.c included linux/module.h twice 2012-02-15 17:21:43 -08:00
speakup TTY: speakup, do not use serialP 2012-03-08 11:47:02 -08:00
ste_rmi4
telephony
tidspbridge staging: tidspbridge: remove nldr_init() and nldr_exit() 2012-03-09 13:21:08 -08:00
usbip Staging: usbip: Remove commented code. 2012-02-24 11:59:57 -08:00
vme staging: vme: fix section mismatches in linux-next 20120314 2012-03-15 14:04:34 -07:00
vt6655 staging: Fix typo in bssdb.c 2012-02-24 12:05:37 -08:00
vt6656 staging: Fix typo in bssdb.c 2012-02-24 12:05:37 -08:00
winbond
wlags49_h2 Staging: wlags49_h2: print MAC via printk format specifier 2012-02-24 15:41:41 -05:00
wlags49_h25
wlan-ng Staging: wlan-ng: still setting wrong data 2012-02-29 15:55:52 -08:00
xgifb staging/xgifb: remove remaining duplicate initdef.h defines 2012-02-10 09:56:25 -08:00
zcache staging/zmem: Use lockdep_assert_held instead of spin_is_locked 2012-03-16 14:47:41 -07:00
zram staging: zram: Rename module parameter 2012-02-13 20:11:54 -08:00
zsmalloc staging: zsmalloc: remove SPARSEMEM dep from Kconfig 2012-03-07 13:31:28 -08:00
Kconfig staging: ozwpan: Plumbed in Kconfig and Kbuild 2012-02-24 09:29:24 -08:00
Makefile staging: ozwpan: Plumbed in Kconfig and Kbuild 2012-02-24 09:29:24 -08:00
staging.c