summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2011-10-3112-30/+83
|\
| * vlan: allow nested vlan_do_receive()Eric Dumazet2011-10-302-4/+7
| * ipv6: fix route lookup in addrconf_prefix_rcv()Andreas Hofmeister2011-10-301-3/+40
| * Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-mergeDavid S. Miller2011-10-302-3/+18
| |\
| | * batman-adv: unify hash_entry field position in tt_local/global_entryAntonio Quartulli2011-10-251-2/+2
| | * batman-adv: add sanity check when removing global ttsSimon Wunderlich2011-10-251-0/+3
| | * batman-adv: remove references for global tt entriesSimon Wunderlich2011-10-251-1/+13
| * | ipv6: fix route error binding peer in func icmp6_dst_allocGao feng2011-10-281-2/+1
| * | ipv6: fix error propagation in ip6_ufo_append_data()Zheng Yan2011-10-281-1/+1
| * | ipv6: tcp: fix TCLASS value in ACK messages sent from TIME_WAITEric Dumazet2011-10-276-17/+16
* | | Merge branch 'for-linus' of git://ceph.newdream.net/git/ceph-clientLinus Torvalds2011-10-286-91/+217
|\ \ \ | |/ / |/| |
| * | libceph: force resend of osd requests if we skip an osdmapSage Weil2011-10-251-10/+16
| * | ceph: use kernel DNS resolverNoah Watkins2011-10-252-12/+116
| * | ceph: fix ceph_monc_init memory leakNoah Watkins2011-10-251-3/+7
| * | libceph: warn on msg allocation failuresSage Weil2011-10-251-0/+1
| * | libceph: don't complain on msgpool alloc failuresSage Weil2011-10-254-19/+32
| * | libceph: always preallocate mon connectionSage Weil2011-10-251-25/+22
| * | libceph: create messenger with clientSage Weil2011-10-251-23/+24
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2011-10-262-2/+4
|\ \ \
| * | | caif: Fix BUG() with network namespacesDavid Woodhouse2011-10-251-2/+3
| * | | net: Unlock sock before calling sk_free()Thomas Gleixner2011-10-251-0/+1
* | | | Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2011-10-261-1/+1
|\ \ \ \
| * | | | TTY: use tty_wait_until_sent_from_close in other driversJiri Slaby2011-08-251-1/+1
* | | | | Merge branch 'for-linus' of git://github.com/ericvh/linuxLinus Torvalds2011-10-266-411/+554
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | net/9p: Convert net/9p protocol dumps to tracepointsAneesh Kumar K.V2011-10-243-79/+54
| * | | | fs/9p: change an int to unsigned intDan Carpenter2011-10-241-1/+2
| * | | | fs/9p: Cleanup option parsing in 9pAneesh Kumar K.V2011-10-241-7/+5
| * | | | 9p: move dereference after NULL checkDan Carpenter2011-10-241-2/+2
| * | | | fs/9p: Update zero-copy implementation in 9pAneesh Kumar K.V2011-10-246-331/+500
| | |/ / | |/| |
* | | | Merge branch 'nfs-for-3.2' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2011-10-255-29/+31
|\ \ \ \
| * | | | NFS: Get rid of nfs_restart_rpc()Trond Myklebust2011-10-191-1/+3
| * | | | SUNRPC: Remove unnecessary export of rpc_sockaddr2uaddrTrond Myklebust2011-10-181-1/+0
| * | | | SUNRPC: Fix rpc_sockaddr2uaddrTrond Myklebust2011-10-182-5/+6
| * | | | SUNRPC/NFS: make rpc pipe upcall genericPeng Tao2011-10-182-22/+22
* | | | | Merge branch 'for-3.2' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2011-10-254-26/+46
|\ \ \ \ \
| * | | | | sunrpc: add MODULE_ALIAS to match the filesystem nameMichal Schmidt2011-10-101-0/+3
| * | | | | SUNRPC: Replace svc_addr_u by sockaddr_storageMi Jinlong2011-09-142-17/+19
| * | | | | sunrpc: use better NUMA affinitiesEric Dumazet2011-08-191-9/+24
* | | | | | Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-10-253-3/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'pm-qos' into pm-for-linusRafael J. Wysocki2011-10-073-3/+3
| |\ \ \ \ \ \
| | * | | | | | PM QoS: Move and rename the implementation filesJean Pihet2011-08-253-3/+3
* | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2011-10-25285-5540/+14144
|\ \ \ \ \ \ \ \
| * | | | | | | | ipv6: Do not use routes from locally generated RAsAndreas Hofmeister2011-10-241-0/+8
| * | | | | | | | net_sched: cls_flow: use skb_header_pointer()Eric Dumazet2011-10-241-92/+96
| * | | | | | | | ipv4: avoid useless call of the function check_peer_pmtuGao feng2011-10-241-2/+1
| * | | | | | | | Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-10-2425-95/+268
| |\ \ \ \ \ \ \ \
| | * | | | | | | | rtnetlink: Add missing manual netlink notification in dev_change_net_namespacesEric W. Biederman2011-10-241-0/+1
| | * | | | | | | | ipv4: fix ipsec forward performance regressionYan, Zheng2011-10-241-7/+7
| | * | | | | | | | route: fix ICMP redirect validationFlavio Leitner2011-10-241-5/+31
| | * | | | | | | | net: hold sock reference while processing tx timestampsRichard Cochran2011-10-241-2/+10
OpenPOWER on IntegriCloud