summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds2012-12-2115-59/+1309
|\
| *-. Merge branches 'cxgb4', 'ipoib' and 'mlx4' into for-nextRoland Dreier2012-12-196-44/+128
| |\ \
| | | * mlx4_core: Allow choosing flow steering modeJack Morgenstein2012-12-193-16/+49
| | | * mlx4_core: Adjustments to Flow Steering activation logic for SR-IOVJack Morgenstein2012-12-193-25/+62
| | | * mlx4_core: Fix error flow in the flow steering wrapperHadar Hen Zion2012-12-191-1/+1
| | | * mlx4_core: Add QPN enforcement for flow steering rules set by VFsHadar Hen Zion2012-12-191-6/+20
| | |/
| * | RDMA/cxgb4: Fix bug for active and passive LE hash collision pathVipul Pandya2012-12-194-6/+24
| * | RDMA/cxgb4: Fix LE hash collision bug for passive open connectionVipul Pandya2012-12-192-0/+55
| * | RDMA/cxgb4: Fix LE hash collision bug for active open connectionVipul Pandya2012-12-193-2/+162
| * | cxgb4: Add LE hash collision bug fix path in LLD driverVipul Pandya2012-12-194-10/+193
| * | cxgb4: Add T4 filter supportVipul Pandya2012-12-198-7/+757
| |/
* | Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2012-12-201-29/+19
|\ \
| * | virtio: net: make it clear that virtqueue_add_buf() no longer returns > 0Rusty Russell2012-12-181-1/+1
| * | virtio_net: don't rely on virtqueue_add_buf() returning capacity.Rusty Russell2012-12-181-20/+13
| * | virtio-net: remove unused skb_vnet_hdr->num_sg fieldMichael S. Tsirkin2012-12-181-3/+3
| * | virtio-net: correct capacity math on ring fullMichael S. Tsirkin2012-12-181-5/+4
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-12-1927-127/+237
|\ \ \
| * | | 8139cp: Prevent dev_close/cp_interrupt race on MTU changeJohn Greene2012-12-191-7/+11
| * | | net: qmi_wwan: add ZTE MF880Bjørn Mork2012-12-191-0/+1
| * | | drivers/net: Use of_match_ptr() macro in smsc911x.cSachin Kamat2012-12-191-1/+3
| * | | drivers/net: Use of_match_ptr() macro in smc91x.cSachin Kamat2012-12-191-3/+1
| * | | use generic usbnet_manage_power()Oliver Neukum2012-12-192-16/+4
| * | | usbnet: generic manage_power()Oliver Neukum2012-12-191-0/+10
| * | | usbnet: handle PM failure gracefullyOliver Neukum2012-12-191-7/+8
| * | | ksz884x: fix receive polling race conditionLennert Buytenhek2012-12-191-3/+9
| * | | qlcnic: update driver versionSigned-off-by: Sony Chacko2012-12-191-2/+2
| * | | qlcnic: fix unused variable warningsShahed Shaikh2012-12-194-12/+6
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-12-192-1/+9
| |\ \ \
| | * | | wireless: fix Atheros drivers compilationVladimir Kondratiev2012-12-171-1/+1
| | * | | rt2x00: zero-out rx_statusGabor Juhos2012-12-171-0/+8
| * | | | net: fec: forbid FEC_PTP on SoCs that do not supportShawn Guo2012-12-181-2/+1
| * | | | be2net: fix wrong frag_idx reported by RX CQSathya Perla2012-12-182-7/+33
| * | | | be2net: fix be_close() to ensure all events are ack'edSathya Perla2012-12-182-9/+17
| * | | | cdc_ether: cleanup: use USB_DEVICE_AND_INTERFACE_INFO for Novatel 551/E362Dan Williams2012-12-171-16/+4
| * | | | qmi_wwan/cdc_ether: add Dell Wireless 5800 (Novatel E362) USB IDsDan Williams2012-12-172-0/+29
| * | | | tuntap: fix sparse warningJason Wang2012-12-171-1/+1
| * | | | tuntap: reset network header before calling skb_get_rxhash()Eric Dumazet2012-12-171-0/+1
| * | | | i2400m: add Intel 6150 device IDsDan Williams2012-12-152-0/+9
| * | | | can: sja1000: fix compilation on x86Marc Kleine-Budde2012-12-151-1/+1
| * | | | cpts: Fix build error caused by include of plat/clock.hTony Lindgren2012-12-141-2/+0
| * | | | bonding: do not cancel works in bond_uninit()Konstantin Khlebnikov2012-12-141-2/+0
| * | | | stmmac: fix platform driver unregisteringKonstantin Khlebnikov2012-12-142-13/+15
| * | | | tuntap: fix ambigious multiqueue APIJason Wang2012-12-141-23/+63
* | | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2012-12-181-20/+0
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'agust/next' into nextBenjamin Herrenschmidt2012-12-1850-328/+534
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'merge' into nextBenjamin Herrenschmidt2012-11-2634-317/+561
| |\ \ \ \ \ \
| * | | | | | | powerpc: Move get_longbusy_msecs into hvcall.h and remove duplicate functionIan Munsie2012-11-151-20/+0
* | | | | | | | bnx2x: use prandom_bytes()Akinobu Mita2012-12-171-4/+1
* | | | | | | | drivers: remove reference to feature-removal-schedule.txtTao Ma2012-12-171-5/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge tag 'mvebu' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-12-144-0/+3102
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |