summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net: use reciprocal_scale() helperDaniel Borkmann2014-08-2314-22/+24
* net: Allow raw buffers to be passed into the flow dissector.David S. Miller2014-08-233-22/+50
* Merge branch 'bcm7xxx_apd_eee'David S. Miller2014-08-236-127/+229
|\
| * net: phy: bcm7xxx: enable EEE at the PHY levelFlorian Fainelli2014-08-232-0/+34
| * net: phy: allow phy_init_eee() to work with internal PHYsFlorian Fainelli2014-08-231-2/+4
| * net: phy: export phy_{read,write}_mmd_indirectFlorian Fainelli2014-08-232-2/+31
| * net: phy: fixed: return an error for Clause 45 over 22 readsFlorian Fainelli2014-08-231-0/+11
| * net: phy: bcm7xxx: enable auto power downFlorian Fainelli2014-08-231-1/+26
| * net: phy: broadcom: move shadow 0x1C register accessors to brcmphy.hFlorian Fainelli2014-08-232-18/+20
| * net: phy: broadcom: extract all registers to brcmphy.hFlorian Fainelli2014-08-232-104/+103
|/
* Merge branch 'tipc-next'David S. Miller2014-08-2320-1301/+956
|\
| * tipc: merge struct tipc_port into struct tipc_sockJon Paul Maloy2014-08-232-241/+206
| * tipc: remove files ref.h and ref.cJon Paul Maloy2014-08-236-334/+250
| * tipc: remove include file port.hJon Paul Maloy2014-08-239-193/+121
| * tipc: remove source file port.cJon Paul Maloy2014-08-233-130/+97
| * tipc: remove port_lockJon Paul Maloy2014-08-234-149/+108
| * tipc: replace port pointer with socket pointer in registryJon Paul Maloy2014-08-232-16/+11
| * tipc: use registry when scanning socketsJon Paul Maloy2014-08-238-107/+133
| * tipc: eliminate functions tipc_port_init and tipc_port_destroyJon Paul Maloy2014-08-233-88/+42
| * tipc: redefine message acknowledge functionJon Paul Maloy2014-08-233-26/+20
| * tipc: eliminate port_connect()/port_disconnect() functionsJon Paul Maloy2014-08-233-132/+37
| * tipc: eliminate function tipc_port_shutdown()Jon Paul Maloy2014-08-233-30/+11
| * tipc: clean up socket timer functionJon Paul Maloy2014-08-232-103/+69
| * tipc: use message to abort connections when losing contact to nodeJon Paul Maloy2014-08-233-25/+85
| * tipc: use pseudo message to wake up sockets after link congestionJon Paul Maloy2014-08-2312-91/+99
| * tipc: introduce new function tipc_msg_create()Jon Paul Maloy2014-08-232-2/+33
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-08-23230-1852/+4691
|\
| * vxlan: fix incorrect initializer in union vxlan_addrGerhard Stenzel2014-08-231-4/+4
| * Merge tag 'pwm/for-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2014-08-221-2/+6
| |\
| | * pwm: Fix period and polarity in pwm_get() for non-perfect matchesGeert Uytterhoeven2014-08-181-2/+6
| * | mac80211: fix channel switch for chanctx-based driversMichal Kazior2014-08-221-1/+1
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-08-2238-261/+413
| |\ \
| | * | drivers: isdn: eicon: xdi_msg.h: Fix typo in #ifndefRasmus Villemoes2014-08-221-1/+1
| | * | net: sctp: fix suboptimal edge-case on non-active active/retrans path selectionDaniel Borkmann2014-08-221-6/+3
| | * | net: sctp: spare unnecessary comparison in sctp_trans_elect_bestDaniel Borkmann2014-08-221-1/+1
| | * | net: ethernet: broadcom: bnx2x: Remove redundant #ifdefRasmus Villemoes2014-08-221-4/+0
| | * | ibmveth: Fix endian issues with rx_no_buffer statisticAnton Blanchard2014-08-221-4/+14
| | * | net: xgene: fix possible NULL dereference in xgene_enet_free_desc_rings()Iyappan Subramanian2014-08-221-7/+13
| | * | openvswitch: fix panic with multiple vlan headersJiri Benc2014-08-221-0/+5
| | * | net: ipv6: fib: don't sleep inside atomic lockBenjamin Block2014-08-221-1/+1
| | * | net: fec: ptp: avoid register access when ipg clock is disabledNimrod Andy2014-08-223-15/+41
| | * | cxgb4: Free completed tx skbs promptlyHariprasad Shenai2014-08-223-2/+5
| | * | Merge tag 'linux-can-fixes-for-3.17-20140821' of git://gitorious.org/linux-ca...David S. Miller2014-08-223-30/+43
| | |\ \
| | | * | can: flexcan: handle state passive -> warning transitionSebastian Andrzej Siewior2014-08-211-0/+7
| | | * | can: flexcan: Disable error interrupt when bus error reporting is disabledAlexander Stein2014-08-211-0/+2
| | | * | can: c_can: checking IS_ERR() instead of NULLDan Carpenter2014-08-211-1/+1
| | | * | can: sja1000: Validate initialization state in start methodMirza Krak2014-08-211-29/+33
| | * | | cxgb4: Fix race condition in cleanupAnish Bhatt2014-08-222-14/+19
| | * | | sctp: not send SCTP_PEER_ADDR_CHANGE notifications with failed probezhuyj2014-08-221-0/+1
| | * | | bnx2x: Revert UNDI flushing mechanismYuval Mintz2014-08-221-75/+17