summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sit_tso'David S. Miller2013-10-219-18/+59
|\
| * bnx2x: add TSO support for SIT tunnelsEric Dumazet2013-10-211-1/+2
| * ipv6: sit: add GSO/TSO supportEric Dumazet2013-10-218-11/+40
| * ipv6: gso: make ipv6_gso_segment() stackableEric Dumazet2013-10-211-6/+17
|/
* atm: firestream: remove duplicate defineMichael Opdenacker2013-10-211-1/+0
* chelsio: remove duplicate definesMichael Opdenacker2013-10-211-35/+0
* ethernet: moxa: remove duplicate includesMichael Opdenacker2013-10-211-1/+0
* cgxb4: remove duplicate include in cxgb4.hMichael Opdenacker2013-10-211-1/+0
* Merge branch 'pernet_sysctls'David S. Miller2013-10-2112-186/+57
|\
| * ipv4: Allow unprivileged users to use per net sysctlsEric W. Biederman2013-10-211-4/+0
| * ipv4: Use math to point per net sysctls into the appropriate struct net.Eric W. Biederman2013-10-211-18/+5
| * tcp_memcontrol: Kill struct tcp_memcontrolEric W. Biederman2013-10-214-70/+35
| * tcp_memcontrol: Remove the per netns control.Eric W. Biederman2013-10-219-34/+21
| * tcp_memcontrol: Remove setting cgroup settings via sysctlEric W. Biederman2013-10-213-52/+2
| * tcp_memcontrol: Remove tcp_max_memoryEric W. Biederman2013-10-212-14/+0
|/
* Merge branch 'pci_set_drvdata'David S. Miller2013-10-2122-40/+0
|\
| * net: packetengines: remove unnecessary pci_set_drvdata()Jingoo Han2013-10-212-3/+0
| * net: neterion: remove unnecessary pci_set_drvdata()Jingoo Han2013-10-212-4/+0
| * net: natsemi: remove unnecessary pci_set_drvdata()Jingoo Han2013-10-211-2/+0
| * net: myri10ge: remove unnecessary pci_set_drvdata()Jingoo Han2013-10-211-1/+0
| * net: ksz884x: remove unnecessary pci_set_drvdata()Jingoo Han2013-10-211-2/+0
| * net: sky2: remove unnecessary pci_set_drvdata()Jingoo Han2013-10-211-3/+0
| * net: skge: remove unnecessary pci_set_drvdata()Jingoo Han2013-10-211-2/+0
| * net: jme: remove unnecessary pci_set_drvdata()Jingoo Han2013-10-211-2/+0
| * net: e100: remove unnecessary pci_set_drvdata()Jingoo Han2013-10-211-2/+0
| * net: icplus: remove unnecessary pci_set_drvdata()Jingoo Han2013-10-211-1/+0
| * net: fealnx: remove unnecessary pci_set_drvdata()Jingoo Han2013-10-211-1/+0
| * net: be2net: remove unnecessary pci_set_drvdata()Jingoo Han2013-10-211-2/+0
| * net: dl2k: remove unnecessary pci_set_drvdata()Jingoo Han2013-10-211-1/+0
| * net: sundance: remove unnecessary pci_set_drvdata()Jingoo Han2013-10-211-2/+0
| * net: tulip: remove unnecessary pci_set_drvdata()Jingoo Han2013-10-216-12/+0
|/
* nf_tables*.h: Remove extern from function prototypesJoe Perches2013-10-212-43/+40
* net: fix build warnings because of net_get_random_once mergeHannes Frederic Sowa2013-10-211-0/+1
* Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2013-10-1924-487/+1851
|\
| * batman-adv: make the backbone gw check VLAN specificAntonio Quartulli2013-10-193-43/+27
| * batman-adv: make the TT global purge routine VLAN specificAntonio Quartulli2013-10-195-6/+21
| * batman-adv: make the TT CRC logic VLAN specificAntonio Quartulli2013-10-195-157/+730
| * batman-adv: lock around TT operations to avoid sending inconsistent dataAntonio Quartulli2013-10-194-4/+34
| * batman-adv: remove bogus commentAntonio Quartulli2013-10-191-5/+0
| * batman-adv: refine API calls for unicast transmissions of SKBsLinus Lüssing2013-10-194-48/+108
| * batman-adv: make the AP isolation attribute VLAN specificAntonio Quartulli2013-10-196-16/+33
| * batman-adv: add sysfs framework for VLANAntonio Quartulli2013-10-194-3/+198
| * batman-adv: add per VLAN interface attribute frameworkAntonio Quartulli2013-10-195-3/+197
| * batman-adv: make the Distributed ARP Table vlan awareAntonio Quartulli2013-10-192-48/+107
| * batman-adv: make the GW module correctly talk to the new VLAN-TTAntonio Quartulli2013-10-191-3/+18
| * batman-adv: print the VID together with the TT entriesAntonio Quartulli2013-10-192-32/+52
| * batman-adv: use vid when computing local and global TT CRCAntonio Quartulli2013-10-191-4/+31
| * batman-adv: add the VLAN ID attribute to the TT entryAntonio Quartulli2013-10-1913-135/+312
| * batman-adv: update email address for Marek LindnerMarek Lindner2013-10-194-10/+10
| * batman-adv: update email address for Antonio QuartulliAntonio Quartulli2013-10-191-1/+1
OpenPOWER on IntegriCloud