summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mac802154: llsec: correctly lookup implicit-indexed keysPhoebe Buckheister2014-05-221-0/+2
* Merge branch 'mac80211'David S. Miller2014-05-221-2/+2
|\
| * mac802154: llsec: fold useless return value checkPhoebe Buckheister2014-05-221-1/+1
| * mac802154: llsec: fix incorrect lock pairingPhoebe Buckheister2014-05-221-1/+1
|/
* net: davinci_emac: fix oops caused by uninitialized ndev->devSekhar Nori2014-05-221-4/+2
* Merge branch 'fixed_phy'David S. Miller2014-05-2213-109/+76
|\
| * powerpc/fsl: fsl_soc: remove 'fixed-link' parsing codeFlorian Fainelli2014-05-221-32/+0
| * of: mdio: remove of_phy_connect_fixed_linkFlorian Fainelli2014-05-222-48/+0
| * ucc_geth: use the new fixed PHY helpersFlorian Fainelli2014-05-221-3/+11
| * gianfar: use the new fixed PHY helpersFlorian Fainelli2014-05-221-3/+11
| * fs_enet: use the new fixed PHY helpersFlorian Fainelli2014-05-221-7/+10
| * net: systemport: use the new fixed PHY helpersFlorian Fainelli2014-05-222-2/+16
| * net: bcmgenet: use the new fixed PHY helpersFlorian Fainelli2014-05-221-8/+13
| * Documentation: devicetree: net: refer to fixed-link.txtFlorian Fainelli2014-05-223-6/+3
| * Documentation: devicetree: add old and deprecated 'fixed-link'Florian Fainelli2014-05-221-0/+12
|/
* Merge branch 'vlan_features'David S. Miller2014-05-224-3/+18
|\
| * teaming: fix vlan_features computingMichal Kubeček2014-05-221-1/+1
| * bonding: fix vlan_features computingMichal Kubeček2014-05-221-0/+1
| * vlan: more careful checksum features handlingMichal Kubeček2014-05-222-2/+16
|/
* net: fec: correct the MDIO clock sourceNimrod Andy2014-05-221-1/+1
* net: fec: optimize the clock management to save powerNimrod Andy2014-05-221-64/+56
* Merge branch 'sw_tso'David S. Miller2014-05-225-78/+492
|\
| * net: mv643xx_eth: Implement software TSOEzequiel Garcia2014-05-221-4/+160
| * net: mv643xx_eth: Use dma_map_single() to map the skb fragmentsEzequiel Garcia2014-05-221-12/+6
| * net: mv643xx_eth: Factorize feature settingEzequiel Garcia2014-05-221-3/+5
| * net: mv643xx_eth: Avoid setting the initial TCP checksumEzequiel Garcia2014-05-221-3/+6
| * net: mv643xx_eth: Factorize initial checksum and command preparationEzequiel Garcia2014-05-221-48/+65
| * net: mvneta: Implement software TSOEzequiel Garcia2014-05-221-1/+152
| * net: mvneta: Clean mvneta_tx() sk_buff handlingEzequiel Garcia2014-05-221-8/+7
| * net: mvneta: Factorize feature settingEzequiel Garcia2014-05-221-2/+2
| * net: Add a software TSO helper APIEzequiel Garcia2014-05-223-1/+93
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftablesDavid S. Miller2014-05-2213-472/+1407
|\
| * netfilter: nf_tables: defer all object release via rcuPablo Neira Ayuso2014-05-192-39/+56
| * netfilter: nf_tables: remove skb and nlh from context structurePablo Neira Ayuso2014-05-192-59/+52
| * netfilter: nf_tables: simplify nf_tables_*_notifyPablo Neira Ayuso2014-05-191-58/+32
| * netfilter: nf_tables: use new transaction infrastructure to handle elementsPablo Neira Ayuso2014-05-192-14/+78
| * netfilter: nf_tables: use new transaction infrastructure to handle tablePablo Neira Ayuso2014-05-192-19/+136
| * netfilter: nf_tables: pass context to nf_tables_updtable()Pablo Neira Ayuso2014-05-191-25/+26
| * netfilter: nf_tables: disabling table hooks always succeedsPablo Neira Ayuso2014-05-191-6/+3
| * netfilter: nf_tables: use new transaction infrastructure to handle chainPablo Neira Ayuso2014-05-192-45/+175
| * netfilter: nf_tables: refactor chain statistic routinesPablo Neira Ayuso2014-05-191-21/+24
| * netfilter: nf_tables: use new transaction infrastructure to handle setsPablo Neira Ayuso2014-05-194-18/+133
| * netfilter: nf_tables: add message type to transactionsPablo Neira Ayuso2014-05-192-31/+45
| * netfilter: nf_tables: relocate commit and abort routines in the source filePablo Neira Ayuso2014-05-191-80/+80
| * netfilter: nf_tables: generalise transaction infrastructurePablo Neira Ayuso2014-05-192-58/+80
| * netfilter: nf_tables: deconstify table and chain in context structurePablo Neira Ayuso2014-05-192-32/+32
| * netfilter: nf_tables: relax string validation of NFTA_CHAIN_TYPEPablo Neira2014-04-281-1/+1
| * netfilter: nf_tables: Add meta expression key for bridge interface nameTomasz Bursztyka2014-04-245-2/+158
| * netfilter: nf_tables: Make meta expression core functions publicTomasz Bursztyka2014-04-232-25/+61
| * netfilter: nf_tables: Stack expression type depending on their familyTomasz Bursztyka2014-04-231-1/+4