summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-07-316-13/+80
|\
| * tun: Fix formatting.David S. Miller2012-07-301-2/+2
| * net/tun: fix ioctl() based info leaksMathias Krause2012-07-291-1/+3
| * tg3: Update version to 3.124Michael Chan2012-07-291-1/+1
| * tg3: Fix race condition in tg3_get_stats64()Michael Chan2012-07-291-2/+4
| * tg3: Add New 5719 Read DMA workaroundMichael Chan2012-07-292-1/+29
| * tg3: Fix Read DMA workaround for 5719 A0.Michael Chan2012-07-291-2/+1
| * tg3: Request APE_LOCK_PHY before PHY accessMichael Chan2012-07-292-0/+38
| * seeq: use PTR_RET at init_module of driverDevendra Naga2012-07-291-3/+1
| * bnx2x: remove cast around the kmalloc in bnx2x_prev_mark_pathDevendra Naga2012-07-291-2/+1
| * qlge: Add offload features to vlan interfacesbrenohl@br.ibm.com2012-07-291-0/+1
* | Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-07-303-66/+17
|\ \
| * | net/stmmac: remove conditional compilation of clk codeViresh Kumar2012-07-302-58/+17
| * | net/c_can: remove conditional compilation of clk codeViresh Kumar2012-07-301-8/+0
| |/
* | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-07-302-139/+265
|\ \ | |/ |/|
| * netdev: octeon_mgmt: Convert to use device tree.David Daney2012-07-231-105/+207
| * netdev: mdio-octeon.c: Convert to use device tree.David Daney2012-07-231-34/+58
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-07-282-6/+1
|\ \
| * \ Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2012-07-271-5/+0
| |\ \
| | * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-07-271-5/+0
| | |\ \
| | | * | mac80211_hwsim: fix possible race condition in usage of info->control.sta & c...Thomas Huehn2012-07-261-5/+0
| * | | | USB: kaweth.c: use GFP_ATOMIC under spin_lockDan Carpenter2012-07-271-1/+1
* | | | | Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-07-271-6/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| | | | |
| | \ \ \
| | \ \ \
| | \ \ \
| *---. \ \ \ Merge branches 'audit', 'delay', 'fixes', 'misc' and 'sta2x11' into for-linusRussell King2012-07-271-6/+6
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | | | * | | ARM: 7459/1: irda/pxa: use readl_relaxed() to access OSCR registerArnd Bergmann2012-07-091-6/+6
| | | |/ / /
* | | | | | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-07-261-0/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixesArnd Bergmann2012-07-251-0/+6
| |\ \ \ \ \
| | * | | | | ARM: Orion: fix driver probe error handling with respect to clkSimon Baatz2012-07-251-0/+6
| | | |/ / / | | |/| | |
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-07-2617-80/+223
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | pch_gbe: vlan skb len fixAndy Cress2012-07-261-7/+0
| * | | | | pch_gbe: add extra clean txAndy Cress2012-07-261-13/+44
| * | | | | pch_gbe: fix transmit watchdog timeoutAndy Cress2012-07-261-1/+1
| * | | | | ixgbe: fix panic while dumping packets on Tx hang with IOMMUEmil Tantilov2012-07-261-5/+6
| | |_|_|/ | |/| | |
| * | | | be2net: Fix to parse RSS hash from Receive completions correctly.Sarveshwar Bandi2012-07-261-2/+2
| * | | | net/mlx4_en: Limit the RFS filter IDs to be < RPS_NO_FILTERAmir Vadai2012-07-261-1/+1
| * | | | hyperv: Add error handling to rndis_filter_device_add()Haiyang Zhang2012-07-251-7/+4
| * | | | hyperv: Add a check for ring_size valueHaiyang Zhang2012-07-251-1/+6
| * | | | net/pch_gpe: Cannot disable ethernet autonegationWei Yang2012-07-252-2/+3
| * | | | net: wiznet add missing HAS_IOMEM dependencyfrank.blaschka@de.ibm.com2012-07-251-0/+1
| * | | | be2net: Missing byteswap in be_get_fw_log_level causes oops on PowerPCAnton Blanchard2012-07-252-3/+4
| * | | | mlx4: Add support for EEH error recoveryKleber Sacilotto de Souza2012-07-253-11/+93
| * | | | cdc-ncm: tag Ericsson WWAN devices (eg F5521gw) with FLAG_WWANDan Williams2012-07-241-23/+45
| * | | | caif: fix NULL pointer checkAlan Cox2012-07-241-0/+3
| * | | | team: init error value to 0 in team_netpoll_setup()Jiri Pirko2012-07-241-1/+1
| * | | | bnx2x: Correct EEE statistics gatheringYuval Mintz2012-07-242-3/+9
* | | | | Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pciLinus Torvalds2012-07-241-2/+2
|\ \ \ \ \
| * | | | | PCI: replace struct pci_bus secondary/subordinate with busn_resYinghai Lu2012-06-131-2/+2
* | | | | | Merge tag 'rdma-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2012-07-249-130/+206
|\ \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *-. \ \ \ \ \ Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma'...Roland Dreier2012-07-229-130/+206
| |\ \ \ \ \ \ \
| | | * | | | | | net/mlx4_core: Free ICM table in case of errorDotan Barak2012-07-111-0/+2
OpenPOWER on IntegriCloud