summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* r8152: increase the tx timeouthayeswang2014-07-081-1/+1
* ipconfig: add static to local variableFabian Frederick2014-07-081-1/+1
* Merge branch 'amd-xgbe-next'David S. Miller2014-07-086-101/+145
|\
| * amd-xgbe: Base AXI DMA cache settings on device treeLendacky, Thomas2014-07-083-18/+37
| * amd-xgbe: Performance enhancementsLendacky, Thomas2014-07-084-78/+100
| * amd-xgbe: Call netif_napi_del on ndo_stop operationLendacky, Thomas2014-07-081-3/+6
| * amd-xgbe: Clear the proper MTL interrupt registerLendacky, Thomas2014-07-081-1/+1
| * amd-xgbe: Fix debugfs compatibility change with kstrtouintLendacky, Thomas2014-07-081-2/+2
|/
* net: arcnet: Remove "#define bool int"Rasmus Villemoes2014-07-081-7/+3
* enic: fix return values in enic_set_coalesceGovindarajulu Varadarajan2014-07-082-17/+12
* bonding: remove no longer relevant vlan warningsJiri Pirko2014-07-081-7/+0
* Merge branch 'at86rf230-next'David S. Miller2014-07-084-554/+990
|\
| * at86rf230: add new authorAlexander Aring2014-07-081-0/+1
| * at86rf230: add sleep cycle timingAlexander Aring2014-07-081-1/+6
| * at86rf230: add timing for channel switchAlexander Aring2014-07-081-1/+7
| * at86rf230: rework reset to trx_off state changeAlexander Aring2014-07-081-1/+15
| * at86rf230: rework state change and start/stopAlexander Aring2014-07-081-59/+67
| * at86rf230: rework irq_pol settingAlexander Aring2014-07-081-5/+2
| * at86rf230: move RX_SAFE_MODE setting to hw_initAlexander Aring2014-07-081-5/+4
| * at86rf230: rework transmit and receive handlingAlexander Aring2014-07-081-268/+571
| * at86rf230: add support for at86rf23x desenseAlexander Aring2014-07-081-4/+18
| * at86rf230: remove is212 and add driver dataAlexander Aring2014-07-081-23/+36
| * at86rf230: rework detect device handlingAlexander Aring2014-07-081-107/+76
| * at86rf230: add regmap supportAlexander Aring2014-07-082-105/+168
| * mac802154: at86rf230: add hw flags and merge opsAlexander Aring2014-07-083-58/+102
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2014-07-0815-176/+731
|\
| * i40e/i40evf: Bump i40e to 0.4.21 and i40evf to 0.9.40Catherine Sullivan2014-07-032-2/+2
| * i40e: Implement set_settings for ethtoolCatherine Sullivan2014-07-031-0/+158
| * i40e: Add set_pauseparam to ethtoolCatherine Sullivan2014-07-031-0/+76
| * i40e/i40evf: Add set_fc and init of FC settingsCatherine Sullivan2014-07-035-56/+154
| * i40e: move nway resetJesse Brandeburg2014-07-031-19/+19
| * i40e/i40evf: Add new HW link info variable an_enabled and function update_lin...Catherine Sullivan2014-07-035-2/+80
| * i40e: Finish implementation of ethtool get settingsJesse Brandeburg2014-07-031-23/+127
| * i40e: disable TPHJesse Brandeburg2014-07-032-8/+0
| * i40e: Fix a boundary condition and turning off of ntupleAnjali Singhai Jain2014-07-031-3/+5
| * i40evf: invite vector 0 to the interrupt partyMitch Williams2014-07-031-0/+7
| * i40e: tolerate lost interruptsMitch Williams2014-07-031-6/+2
| * i40e/i40evf: Force a shifted '1' to be unsignedPaul M Stillwell Jr2014-07-032-4/+4
| * i40evf: don't violate scopeMitch Williams2014-07-031-1/+1
| * i40e/i40evf: Do not free the dummy packet buffer synchronouslyAnjali Singhai Jain2014-07-035-52/+96
* | Merge branch 'fec-next'David S. Miller2014-07-082-59/+79
|\ \
| * | net: fec: fix missing kmalloc() failure check in fec_enet_alloc_buffers()Russell King2014-07-081-6/+9
| * | net: fec: ensure fec_enet_free_buffers() properly cleans the ringsRussell King2014-07-081-1/+6
| * | net: fec: clean up transmit descriptor setupRussell King2014-07-081-15/+18
| * | net: fec: make rx skb handling more robustRussell King2014-07-081-6/+11
| * | net: fec: remove useless fep->openedRussell King2014-07-082-6/+0
| * | net: fec: stop the phy before shutting down the MACRussell King2014-07-081-1/+4
| * | net: fec: ensure that a disconnected phy isn't configuredRussell King2014-07-081-0/+4
| * | net: fec: remove checking for NULL phy_dev in fec_enet_close()Russell King2014-07-081-4/+2
| * | net: fec: use netif_tx_disable() rather than netif_stop_queue()Russell King2014-07-081-2/+2