summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net_sched: fix a regression in tcf_proto_lookup_ops()Eric Dumazet2013-12-201-12/+10
* net_sched: fix a regression in tc actionsWANG Cong2013-12-209-11/+11
* Merge branch 'bridge_cleanups'David S. Miller2013-12-2014-47/+36
|\
| * bridge: change the position of '{' to the pre linetanxiaojun2013-12-204-18/+9
| * bridge: change "foo* bar" to "foo *bar"tanxiaojun2013-12-202-10/+10
| * bridge: add space before '(/{', after ',', etc.tanxiaojun2013-12-207-12/+12
| * bridge: remove unnecessary parenthesestanxiaojun2013-12-202-3/+3
| * bridge: remove unnecessary condition judgmenttanxiaojun2013-12-202-4/+2
|/
* bnx2x: cleanup skb_set_hashTom Herbert2013-12-202-13/+12
* Merge branch 'sh_eth'David S. Miller2013-12-202-7/+5
|\
| * sh_eth: do not reset PHY needlesslySergei Shtylyov2013-12-201-5/+0
| * sh_eth: add PHY IRQ to platform dataSergei Shtylyov2013-12-202-2/+5
|/
* Merge branch 'mlx4'David S. Miller2013-12-2010-33/+180
|\
| * net/mlx4_core: Check port number for validity before accessing dataMatan Barak2013-12-201-1/+27
| * net/mlx4_en: Add NAPI support for transmit sideEugenia Emantayev2013-12-203-11/+41
| * net/mlx4_en: Ignore irrelevant hypervisor eventsEugenia Emantayev2013-12-201-0/+3
| * net/mlx4_core: Set CQE/EQE size to 64B by defaultEyal Perry2013-12-201-2/+2
| * net/mlx4_en: Configure the XPS queue mapping on driver loadIdo Shamay2013-12-203-4/+16
| * net/mlx4_en: Implement ndo_get_phys_port_idHadar Hen Zion2013-12-201-0/+23
| * net/mlx4_core: Expose physical port id as PF/VF capabilityHadar Hen Zion2013-12-204-0/+53
| * net/mlx4_core: Introduce nic_info new flag in QUERY_FUNC_CAPHadar Hen Zion2013-12-202-3/+9
| * net/mlx4_core: Rename QUERY_FUNC_CAP fieldsHadar Hen Zion2013-12-201-10/+10
| * net/mlx4_core: Remove zeroed out of explicit QUERY_FUNC_CAP fieldsHadar Hen Zion2013-12-201-6/+0
|/
* rps: NUMA flow limit allocationsEric Dumazet2013-12-201-1/+2
* drivers: net: Mark functions as static in debug.cRashika Kheria2013-12-201-1/+1
* drivers: net: Mark functions as static in 4965-debug.cRashika Kheria2013-12-201-3/+3
* drivers: net: Mark functions as static in 3945-debug.cRashika Kheria2013-12-201-3/+3
* drivers: net: Include new header file in sbni.cRashika Kheria2013-12-203-28/+33
* drivers: net: Mark functions as static in stmmac_platform.cRashika Kheria2013-12-201-2/+2
* drivers: net: Mark functions as static in qlcnic_83xx_hw.cRashika Kheria2013-12-201-3/+3
* drivers: net: Mark functions as static in qlcnic_io.cRashika Kheria2013-12-201-3/+3
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2013-12-2029-243/+277
|\
| * xfrm: Add file to document IPsec corner caseFan Du2013-12-161-0/+38
| * xfrm: export verify_userspi_info for pkfey and netlink interfaceFan Du2013-12-164-24/+32
| * xfrm: check user specified spi for IPCompFan Du2013-12-161-1/+3
| * net: Remove FLOWI_FLAG_CAN_SLEEPSteffen Klassert2013-12-0622-46/+31
| * xfrm: Remove ancient sleeping when the SA is in acquire stateSteffen Klassert2013-12-064-44/+5
| * xfrm: Namespacify xfrm state/policy locksFan Du2013-12-066-114/+138
| * xfrm: Using the right namespace to migrate key infoFan Du2013-12-064-8/+10
| * xfrm: Try to honor policy index if it's supplied by userFan Du2013-12-062-6/+20
* | Merge branch 'bonding_nl'David S. Miller2013-12-205-61/+225
|\ \
| * | bonding: add packets_per_slave attribute netlink supportsfeldma@cumulusnetworks.com2013-12-205-17/+58
| * | bonding: add lp_interval attribute netlink supportsfeldma@cumulusnetworks.com2013-12-205-11/+38
| * | bonding: add min_links attribute netlink supportsfeldma@cumulusnetworks.com2013-12-205-4/+34
| * | bonding: add all_slaves_active attribute netlink supportsfeldma@cumulusnetworks.com2013-12-205-27/+54
| * | bonding: add num_grat_arp attribute netlink supportsfeldma@cumulusnetworks.com2013-12-205-2/+41
|/ /
* | Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-nextDavid S. Miller2013-12-1919-113/+72
|\ \
| * | can: mcp251x: Convert to devm-* APIAlexander Shiyan2013-12-171-13/+6
| * | can: Fix FSF address in file headersJeff Kirsher2013-12-1716-33/+16
| * | can: update MAINTAINERS and DocumentationJohn Whitmore2013-12-172-57/+38