summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'enic-next'David S. Miller2014-12-316-59/+135
|\ \
| * | enic: add stats for dma mapping errorGovindarajulu Varadarajan2014-12-313-1/+25
| * | enic: check dma_mapping_errorGovindarajulu Varadarajan2014-12-312-58/+106
| * | enic: make vnic_wq_buf doubly linkedGovindarajulu Varadarajan2014-12-312-0/+4
|/ /
* | Merge branch 'fec-next'David S. Miller2014-12-318-11/+191
|\ \
| * | ARM: dts: imx6qdl: enable FEC magic-packet featureNimrod Andy2014-12-312-0/+2
| * | ARM: imx: add FEC sleep mode callback functionNimrod Andy2014-12-312-1/+90
| * | net: fec: add Wake-on-LAN supportNimrod Andy2014-12-314-10/+99
|/ /
* | net: gianfar: add missing __iomem annotationKevin Hao2014-12-302-2/+2
* | net: gianfar: mark the local functions staticKevin Hao2014-12-301-4/+5
* | virtio-net: don't do header check for dodgy gso packetsJason Wang2014-12-301-0/+2
* | arm: sa1100: move irda header to linux/platform_dataDmitry Eremin-Solenikov2014-12-306-5/+5
* | net: sxgbe: Use setup_timerJulia Lawall2014-12-301-6/+4
* | ksz884x: Use setup_timerJulia Lawall2014-12-301-3/+1
* | atl1e: Use setup_timerJulia Lawall2014-12-301-3/+2
* | atheros: atlx: Use setup_timerJulia Lawall2014-12-301-6/+4
* | Merge branch 'timecounter'David S. Miller2014-12-3025-245/+274
|\ \
| * | timecounter: keep track of accumulated fractional nanosecondsRichard Cochran2014-12-304-17/+40
| * | net: cpts: convert to timecounter adjtime.Richard Cochran2014-12-301-4/+1
| * | net: mlx4: convert to timecounter adjtime.Richard Cochran2014-12-301-4/+1
| * | net: ixgbe: convert to timecounter adjtime.Richard Cochran2014-12-301-10/+1
| * | net: igb: convert to timecounter adjtime.Richard Cochran2014-12-301-6/+1
| * | net: e1000e: convert to timecounter adjtime.Richard Cochran2014-12-301-4/+1
| * | net: fec: convert to timecounter adjtime.Richard Cochran2014-12-301-15/+1
| * | net: bnx2x: convert to timecounter adjtime.Richard Cochran2014-12-301-5/+1
| * | net: xgbe: convert to timecounter adjtime.Richard Cochran2014-12-301-7/+1
| * | timecounter: provide a helper function to shift the time.Richard Cochran2014-12-301-0/+9
| * | time: move the timecounter/cyclecounter code into its own file.Richard Cochran2014-12-3016-187/+231
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-12-3069-1393/+628
|\ \
| * | genetlink: A genl_bind() to an out-of-range multicast group should not WARN().David S. Miller2014-12-291-6/+1
| * | netlink/genetlink: pass network namespace to bind/unbindJohannes Berg2014-12-277-25/+28
| * | ne2k-pci: Add pci_disable_device in error handlingJia-Ju Bai2014-12-271-2/+4
| * | bonding: change error message to debug message in __bond_release_one()Wengang Wang2014-12-271-1/+1
| * | Merge branch 'netlink_multicast'David S. Miller2014-12-274-13/+83
| |\ \
| | * | genetlink: pass multicast bind/unbind to familiesJohannes Berg2014-12-272-0/+64
| | * | netlink: call unbind when releasing socketJohannes Berg2014-12-271-0/+7
| | * | netlink: update listeners directly when removing socketJohannes Berg2014-12-271-5/+5
| | * | genetlink: pass only network namespace to genl_has_listeners()Johannes Berg2014-12-272-4/+3
| | * | netlink: rename netlink_unbind() to netlink_undo_bind()Johannes Berg2014-12-271-4/+4
| |/ /
| * | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2014-12-261-4/+12
| |\ \
| | * | Bluetooth: Fix accepting connections when not using mgmtJohan Hedberg2014-12-241-1/+6
| | * | Bluetooth: Fix controller configuration with HCI_QUIRK_INVALID_BDADDRMarcel Holtmann2014-12-241-3/+6
| * | | Merge tag 'wireless-drivers-for-davem-2014-12-26' of git://git.kernel.org/pub...David S. Miller2014-12-267-12/+34
| |\ \ \
| | * | | brcmfmac: Do not crash if platform data is not populatedMika Westerberg2014-12-241-2/+2
| | * | | ipw2200: select CFG80211_WEXTPaul Bolle2014-12-241-1/+2
| | * | | Merge tag 'iwlwifi-fixes-for-kalle-2014-12-18' of git://git.kernel.org/pub/sc...Kalle Valo2014-12-215-9/+30
| | |\ \ \
| | | * | | iwlwifi: pcie: limit fw chunk sizes given to fhLiad Kaufman2014-12-142-1/+2
| | | * | | iwlwifi: add new device IDs for 3165Emmanuel Grumbach2014-12-141-0/+4
| | | * | | iwlwifi: don't double free a pointer if no FW was foundEmmanuel Grumbach2014-12-141-1/+1
| | | * | | iwlwifi: pcie: re-ACK all interrupts after device resetEmmanuel Grumbach2014-12-141-5/+10
OpenPOWER on IntegriCloud