summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-10-092-134/+446
|\
| * Merge branch 'broadcom' of git://dev.phrozen.org/mips-next into mips-for-linu...Ralf Baechle2012-09-271-29/+1
| |\
| | * MIPS: BCM63XX: Move DMA descriptor definition into common header fileKevin Cernekee2012-08-301-29/+1
| * | netdev: octeon_mgmt: Make multi-line comment style consistent.David Daney2012-08-311-18/+9
| * | netdev: octeon_mgmt: Remove some useless 'inline'David Daney2012-08-311-4/+4
| * | netdev: octeon_mgmt: Cleanup and modernize MAC address handling.David Daney2012-08-311-7/+9
| * | netdev: octeon_mgmt: Set the parent device.David Daney2012-08-311-0/+2
| * | netdev: octeon_mgmt: Improve ethtool_ops.David Daney2012-08-311-4/+18
| * | netdev: octeon_mgmt: Add hardware timestamp support.Chad Reese2012-08-311-5/+152
| * | netdev: octeon_mgmt: Add support for 1Gig ports.David Daney2012-08-311-73/+255
| |/
* | Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds2012-10-071-0/+2
|\ \
| * | mlx4_core: Adjust flow steering attach wrapper so that IB works on SR-IOV VFsJack Morgenstein2012-10-031-0/+2
* | | Merge tag 'stable/for-linus-3.7-arm-tag' of git://git.kernel.org/pub/scm/linu...Linus Torvalds2012-10-072-0/+2
|\ \ \
| * \ \ Merge branch 'xenarm-for-linus' of git://xenbits.xen.org/people/sstabellini/l...Konrad Rzeszutek Wilk2012-09-262-0/+2
| |\ \ \
| | * | | xen/arm: compile netbackStefano Stabellini2012-08-082-0/+2
* | | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2012-10-063-14/+13
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'pci/pci/gavin-window-alignment' into nextBenjamin Herrenschmidt2012-09-1719-214/+83
| |\ \ \ \ \
| | * \ \ \ \ Merge commit 'v3.6-rc5' into pci/gavin-window-alignmentBjorn Helgaas2012-09-13111-687/+621
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| * | | | | | Merge branch 'merge' into nextBenjamin Herrenschmidt2012-09-07111-692/+621
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | ehea: Remove uses of virt_to_abs() and abs_to_virt()Michael Ellerman2012-09-053-14/+13
* | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-10-0618-148/+176
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fixes-for-3.7' of git://gitorious.org/linux-can/linux-canDavid S. Miller2012-10-043-5/+9
| |\ \ \ \ \ \ \
| | * | | | | | | can: mpc5xxx_can: fix section type conflictMarc Kleine-Budde2012-10-041-4/+4
| | * | | | | | | can: peak_pcmcia: fix error return codePeter Senna Tschudin2012-10-041-1/+3
| | * | | | | | | can: peak_pci: fix error return codePeter Senna Tschudin2012-10-041-0/+2
| * | | | | | | | team: set qdisc_tx_busylock to avoid LOCKDEP splatEric Dumazet2012-10-041-0/+2
| * | | | | | | | bonding: set qdisc_tx_busylock to avoid LOCKDEP splatEric Dumazet2012-10-041-0/+2
| * | | | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2012-10-046-114/+112
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | ixgbe: add support for X540-AT1joshua.a.hay@intel.com2012-10-033-0/+4
| | * | | | | | | ixgbe: fix poll loop for FDIRCTRL.INIT_DONE bitEmil Tantilov2012-10-031-1/+1
| | * | | | | | | ixgbe: fix PTP ethtool timestamping functionJacob Keller2012-10-031-4/+1
| | * | | | | | | ixgbe: (PTP) Fix PPS interrupt codeJacob Keller2012-10-032-61/+48
| | * | | | | | | ixgbe: Fix PTP X540 SDP alignment code for PPS signalJacob Keller2012-10-031-89/+99
| * | | | | | | | cxgb4: Fix build error due to missing linux/vmalloc.h include.David S. Miller2012-10-031-0/+1
| * | | | | | | | bnx2x: fix ring size for 10G functionsYuval Mintz2012-10-031-7/+10
| * | | | | | | | cxgb4: Dynamically allocate memory in t4_memory_rw() and get_vpd_params()Vipul Pandya2012-10-031-13/+30
| |/ / / / / / /
| * | | | | | | tg3: Fix sparse warnings.Michael Chan2012-10-021-5/+6
| * | | | | | | bnx2x: use strlcpy() to copy a stringDan Carpenter2012-10-021-3/+2
| * | | | | | | net: ethernet: davinci_cpdma: decrease the desc count when cleaning up the re...htbegin2012-10-021-0/+1
| * | | | | | | pch_gbe: Fix PTP dependencies.David S. Miller2012-10-021-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | rapidio/rionet: rework to support multiple RIO master portsAlexandre Bounine2012-10-061-63/+70
* | | | | | | rapidio/rionet: fix multicast packet transmit logicAlexandre Bounine2012-10-061-3/+17
* | | | | | | drivers/net/ethernet/dec/tulip: Use standard __set_bit_le() functionTakuya Yoshikawa2012-10-062-10/+4
* | | | | | | drivers/net/ethernet/sfc: use standard __{clear,set}_bit_le() functionsBen Hutchings2012-10-063-16/+4
* | | | | | | sections: fix section conflicts in drivers/net/wanAndi Kleen2012-10-061-1/+1
* | | | | | | sections: fix section conflicts in drivers/net/hamradioAndi Kleen2012-10-065-7/+7
* | | | | | | sections: fix section conflicts in drivers/netAndi Kleen2012-10-0614-15/+15
* | | | | | | Merge tag 'stable/for-linus-3.7-x86-tag' of git://git.kernel.org/pub/scm/linu...Linus Torvalds2012-10-021-8/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | xen/gndev: Xen backend support for paged out grant targets V4.Andres Lagar-Cavilla2012-09-211-8/+3
| | |/ / / | |/| | |
* | | | | Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds2012-10-029-193/+1113
|\ \ \ \ \
OpenPOWER on IntegriCloud