summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bonding-next'David S. Miller2014-07-157-431/+373
|\
| * bonding: remove pr_fmt from bond_options.cVeaceslav Falico2014-07-151-2/+0
| * bonding: convert bond_options.c to use netdev_printk instead of pr_Veaceslav Falico2014-07-151-115/+101
| * bonding: convert bond_procfs.c to use netdev_printk instead of pr_Veaceslav Falico2014-07-151-2/+2
| * bonding: bonding: remove pr_fmt from bond_netlink.cVeaceslav Falico2014-07-151-2/+0
| * bonding: convert bond_netlink.c to use netdev_printk instead of pr_Veaceslav Falico2014-07-151-6/+3
| * bonding: convert bond_debugfs.c to use netdev_printk instead of pr_Veaceslav Falico2014-07-151-4/+2
| * bonding: remove pr_fmt from bond_alb.cVeaceslav Falico2014-07-151-2/+0
| * bonding: convert bond_alb.c to use netdev_printk instead of pr_Veaceslav Falico2014-07-151-19/+15
| * bonding: remove pr_fmt from bond_3ad.cVeaceslav Falico2014-07-151-2/+0
| * bonding: convert bond_3ad.c to use netdev_printk instead of pr_Veaceslav Falico2014-07-151-95/+88
| * bonding: remove pr_fmt from bond_main.cVeaceslav Falico2014-07-151-2/+0
| * bonding: convert bond_main.c to use netdev_printk instead of pr_Veaceslav Falico2014-07-151-180/+162
|/
* drivers: net: cpsw: disable coalesce when rx_coalesce_usecs is zeroMugunthan V N2014-07-151-3/+7
* bonding: fix bond_option_mode_set warningNikolay Aleksandrov2014-07-151-1/+2
* bonding: permit enslaving interfaces without set_mac supportVeaceslav Falico2014-07-151-9/+10
* sfc: add extra RX drop counters for nodesc_trunc and noskb_dropEdward Cree2014-07-159-10/+56
* net: ppp: reset nextseq counter when enabling SC_MULTILINKChristoph Schulz2014-07-151-0/+2
* Merge branch 'bonding_rcu'David S. Miller2014-07-156-64/+91
|\
| * bonding: add proper __rcu annotation for current_arp_slaveEric Dumazet2014-07-152-7/+10
| * bonding: add proper __rcu annotation for curr_active_slaveEric Dumazet2014-07-154-45/+63
| * bonding: use rcu_access_pointer() in bonding_show_mii_status()Eric Dumazet2014-07-151-1/+2
| * bonding: get rid of bond_option_active_slave_get()Eric Dumazet2014-07-153-11/+16
|/
* Merge tag 'linux-can-next-for-3.17-20140715' of git://gitorious.org/linux-can...David S. Miller2014-07-153-42/+31
|\
| * can: sja1000: Add support for CAN_CTRLMODE_PRESUME_ACKNikita Edward Baruzdin2014-07-151-4/+7
| * can: sja1000: Add support for CAN_CTRLMODE_LOOPBACKNikita Edward Baruzdin2014-07-151-5/+13
| * can: netlink: Add CAN_CTRLMODE_PRESUME_ACK flagNikita Edward Baruzdin2014-07-151-0/+1
| * can: netlink: Remove space before tabNikita Edward Baruzdin2014-07-151-1/+1
| * can: c_can: convert to use devm * apiLad, Prabhakar2014-07-151-33/+10
* | net-timestamp: document deprecated syststampWillem de Bruijn2014-07-152-4/+12
* | net-timestamp: SOCK_RAW and PING timestampingWillem de Bruijn2014-07-153-13/+11
* | Merge branch 'amd-xgbe-next'David S. Miller2014-07-153-15/+21
|\ \
| * | amd-xgbe: Remove the adjustments needed for fixed speedLendacky, Thomas2014-07-152-14/+0
| * | phy: Expand phy speed/duplex settings arrayLendacky, Thomas2014-07-151-1/+21
|/ /
* | Merge branch 'net-break-after-goto'David S. Miller2014-07-1518-26/+0
|\ \
| * | net: sctp: remove unnecessary break after return/gotoFabian Frederick2014-07-152-5/+0
| * | ieee802154: remove unnecessary break after gotoFabian Frederick2014-07-151-1/+0
| * | irda: remove unnecessary break after returnFabian Frederick2014-07-152-2/+0
| * | caif: remove unnecessary break after gotoFabian Frederick2014-07-151-1/+0
| * | NFC: remove unnecessary break after gotoFabian Frederick2014-07-151-2/+0
| * | ipv6: remove unnecessary break after returnFabian Frederick2014-07-151-1/+0
| * | netfilter: remove unnecessary break after returnFabian Frederick2014-07-151-1/+0
| * | af_key: remove unnecessary break after returnFabian Frederick2014-07-151-3/+0
| * | mac80211: remove unnecessary break after returnFabian Frederick2014-07-151-1/+0
| * | drop_monitor: remove unnecessary break after returnFabian Frederick2014-07-151-2/+0
| * | pktgen: remove unnecessary break after gotoFabian Frederick2014-07-151-1/+0
| * | netlabel: remove unnecessary break after gotoFabian Frederick2014-07-151-1/+0
| * | af_iucv: remove unnecessary break after gotoFabian Frederick2014-07-151-1/+0
| * | 9P: remove unnecessary break after returnFabian Frederick2014-07-151-1/+0
| * | tipc: remove unnecessary break after returnFabian Frederick2014-07-151-1/+0
OpenPOWER on IntegriCloud