summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm' (patches from Andrew Morton)Linus Torvalds2014-01-311-0/+1
|\
| * drivers/net/phy/mdio_bus.c: call put_device on device_register() failureLevente Kurusa2014-01-311-0/+1
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2014-01-311-116/+154
|\ \ | |/ |/|
| * Merge remote-tracking branch 'agust/next' into nextBenjamin Herrenschmidt2014-01-291-116/+154
| |\
| | * net: can: mscan: remove non-CCF code for MPC512xGerhard Sittig2014-01-121-141/+0Star
| | * net: can: mscan: adjust to common clock support for mpc512xGerhard Sittig2014-01-121-0/+179
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-01-3015-178/+190
|\ \ \ | |/ / |/| |
| * | bonding: fix locking in bond_loadbalance_arp_mon()Ding Tianhong2014-01-292-12/+30
| * | tun: add device name(iff) field to proc fdinfo entryMasatake YAMATO2014-01-291-1/+26
| * | bnx2x: Fix generic option settingsYaniv Rosner2014-01-291-40/+38Star
| * | qlcnic: Fix loopback test failureShahed Shaikh2014-01-281-3/+8
| * | qlcnic: Fix tx timeout.Rajesh Borundia2014-01-281-7/+2Star
| * | qlcnic: Fix initialization of vlan list.Rajesh Borundia2014-01-281-6/+5Star
| * | qlcnic: Correct off-by-one errors in bounds checksManish Chopra2014-01-281-4/+4
| * | i40e: Add missing braces to i40e_dcb_need_reconfig()Dave Jones2014-01-281-1/+2
| * | xen-netfront: fix resource leak in netfrontAnnie Li2014-01-281-62/+26Star
| * | hyperv: Add support for physically discontinuous receive bufferHaiyang Zhang2014-01-282-6/+3Star
| * | sky2: initialize napi before registering deviceStanislaw Gruszka2014-01-281-2/+2
| * | bonding: restructure locking of bond_ab_arp_probe()Veaceslav Falico2014-01-271-21/+36
| * | bonding: RCUify bond_ab_arp_probeVeaceslav Falico2014-01-271-10/+6Star
| * | bnx2x: More Shutdown revisionsYuval Mintz2014-01-271-2/+2
| * | net: stmmac: Log MAC address only onceHans de Goede2014-01-271-2/+2
| * | net: stmmac: Silence PTP init errors on hw without PTPHans de Goede2014-01-271-1/+1
| * | net/apne: Remove unused variable ei_localGeert Uytterhoeven2014-01-271-1/+0Star
* | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2014-01-281-4/+8
|\ \ \ | |/ / |/| / | |/
| * powerpc/iommu: Update the generic code to use dynamic iommu page sizesAlistair Popple2013-12-301-6/+9
| * powerpc/iommu: Update constant names to reflect their hardcoded page sizeAlistair Popple2013-12-301-4/+5
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-01-251005-26692/+56381
|\ \
| * | net/cxgb4: Fix referencing freed adapterGavin Shan2014-01-251-1/+1
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-01-247-7/+20
| |\ \
| | * | ath9k: Fix RX interrupt mitigationSujith Manoharan2014-01-232-2/+12
| | * | rt2x00: rt2800usb: mark D-Link DWA-137 as supportedRoman Dubtsov2014-01-231-0/+1
| | * | ath9k: Fix code mistakeSujith Manoharan2014-01-231-1/+1
| | * | b43: fix the wrong assignment of status.freq in b43_rx()ZHAO Gang2014-01-231-2/+2
| | * | mwifiex: fix wakeup on magic packetAndreas Fenkart2014-01-231-1/+1
| | * | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw...John W. Linville2014-01-231-1/+3
| | |\ \
| | | * | iwlwifi: pcie: don't panic on host commands in iwldvmEmmanuel Grumbach2014-01-201-1/+3
| * | | | qlcnic: update version to 5.3.55Himanshu Madhani2014-01-241-2/+2
| * | | | qlcnic: Enhance logic to calculate msix vectors.Himanshu Madhani2014-01-244-97/+192
| * | | | qlcnic: Refactor interrupt coalescing code for all adapters.Himanshu Madhani2014-01-247-117/+200
| * | | | qlcnic: Update poll controller code pathManish chopra2014-01-241-6/+28
| * | | | qlcnic: Interrupt code cleanupManish chopra2014-01-246-72/+121
| * | | | qlcnic: Enhance Tx timeout debugging.Himanshu Madhani2014-01-242-20/+51
| * | | | qlcnic: Use bool for rx_mac_learn.Sucheta Chakraborty2014-01-245-7/+7
| * | | | bonding: fix u64 divisionNikolay Aleksandrov2014-01-241-10/+14
| * | | | sfc: Use the correct maximum TX DMA ring size for SFC9100Ben Hutchings2014-01-232-2/+5
| * | | | net/vxlan: Share RX skb de-marking and checksum checks with ovsOr Gerlitz2014-01-231-11/+10Star
| * | | | tulip: cleanup by using ARRAY_SIZE()Dan Carpenter2014-01-231-1/+1
| * | | | net/cxgb4: Don't retrieve stats during recoveryGavin Shan2014-01-231-0/+10
| * | | | net/cxgb4: Avoid disabling PCI device for towiceGavin Shan2014-01-232-7/+21