summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebi...Linus Torvalds2012-05-236-16/+43
|\
| * userns: Replace user_ns_map_uid and user_ns_map_gid with from_kuid and from_kgidEric W. Biederman2012-05-031-2/+2
| * userns: Convert group_info values from gid_t to kgid_t.Eric W. Biederman2012-05-035-14/+41
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-05-222-3/+3
|\ \
| * | Kconfig: replace "--- help ---" with "---help---"Paul Bolle2012-05-071-1/+1
| * | Merge branch 'master' into for-nextJiri Kosina2012-04-08437-10507/+16142
| |\ \
| * | | atm: fix commentsAlexandra Vintila2012-04-051-2/+2
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-05-221-26/+1
|\ \ \ \
| * | | | HID: Create a common generic driverHenrik Rydberg2012-05-011-26/+1
| * | | | HID: Create a generic device groupHenrik Rydberg2012-05-011-1/+1
* | | | | Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cg...Linus Torvalds2012-05-224-83/+65
|\ \ \ \ \
| * | | | | cgroup: pass struct mem_cgroup instead of struct cgroup to socket memcgGlauber Costa2012-04-102-9/+7
| * | | | | cgroup: convert memcg controller to the new cftype interfaceTejun Heo2012-04-011-6/+10
| * | | | | cgroup: convert all non-memcg controllers to the new cftype interfaceTejun Heo2012-04-012-12/+4
| * | | | | cgroup: relocate cftype and cgroup_subsys definitions in controllersTejun Heo2012-04-013-61/+49
| | |_|_|/ | |/| | |
* | | | | Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/pe...Linus Torvalds2012-05-222-8/+8
|\ \ \ \ \
| * | | | | net: replace percpu_xxx funcs with this_cpu_xxx or __this_cpu_xxxAlex Shi2012-05-142-8/+8
* | | | | | Merge tag 'tty-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2012-05-221-73/+64
|\ \ \ \ \ \
| * | | | | | tty_lock: Localise the lockAlan Cox2012-05-041-2/+2
| * | | | | | Merge 3.4-rc3 into tty-nextGreg Kroah-Hartman2012-04-1820-144/+79
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | TTY: rfcomm/tty, use count from tty_portJiri Slaby2012-04-091-9/+21
| * | | | | | TTY: rfcomm/tty, remove work for tty_wakeupJiri Slaby2012-04-091-19/+3
| * | | | | | TTY: rfcomm/tty, use tty_port refcountingJiri Slaby2012-04-091-32/+26
| * | | | | | TTY: rfcomm/tty, add tty_portJiri Slaby2012-04-091-12/+13
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2012-05-214-13/+7
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into nextJames Morris2012-05-221-0/+1
| |\ \ \ \ \ \
| | * | | | | | SELinux: include flow.h where used rather than get it indirectlyEric Paris2012-04-091-0/+1
| | |/ / / / /
| * | | | | | KEYS: Announce key type (un)registrationDavid Howells2012-05-111-5/+0
| * | | | | | Merge tag 'v3.4-rc5' into nextJames Morris2012-05-0437-248/+213
| |\ \ \ \ \ \
| * | | | | | | net/compat.c,linux/filter.h: share compat_sock_fprogWill Drewry2012-04-141-8/+0
| * | | | | | | sk_run_filter: add BPF_S_ANC_SECCOMP_LD_WWill Drewry2012-04-141-0/+6
| | |/ / / / / | |/| | | | |
* | | | | | | Merge tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-05-211-1/+2
|\ \ \ \ \ \ \
| * | | | | | | 9p: disconnect channel when PCI device is removedSasha Levin2012-05-221-1/+2
* | | | | | | | net: drop NET dependency from HAVE_BPF_JITSam Ravnborg2012-05-211-3/+4
* | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-05-21543-11997/+18656
|\ \ \ \ \ \ \ \
| * | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-05-202-4/+3
| |\| | | | | | |
| * | | | | | | | ipv6/exthdrs: strict Pad1 and PadN checkEldad Zack2012-05-201-1/+14
| * | | | | | | | net/ipv4: replace simple_strtoul with kstrtoulEldad Zack2012-05-203-3/+21
| * | | | | | | | net/ipv4/ipconfig: neaten __setup placementEldad Zack2012-05-201-3/+2
| * | | | | | | | ipv6: use skb coalescing in reassemblyEric Dumazet2012-05-191-6/+20
| * | | | | | | | ipv4: use skb coalescing in defragmentationEric Dumazet2012-05-191-6/+20
| * | | | | | | | net: introduce skb_try_coalesce()Eric Dumazet2012-05-192-64/+89
| * | | | | | | | net:ipv6:fixed space issues relating to operators.Jeffrin Jose2012-05-191-2/+2
| * | | | | | | | net:ipv6:fixed a trailing white space issue.Jeffrin Jose2012-05-191-1/+1
| * | | | | | | | ipv6: disable GSO on sockets hitting dst_allfragEric Dumazet2012-05-191-1/+4
| * | | | | | | | net: napi_frags_skb() is staticEric Dumazet2012-05-191-2/+1
| * | | | | | | | ipv6: bool/const conversions phase2Eric Dumazet2012-05-1913-118/+119
| * | | | | | | | ipx: Remove spurious NULL checking in ipx_ioctl().David S. Miller2012-05-191-3/+1
| * | | | | | | | ipv6: ip6_fragment() should check CHECKSUM_PARTIALEric Dumazet2012-05-181-0/+4
| * | | | | | | | ipv6: remove csummode in ip6_append_data()Eric Dumazet2012-05-181-3/+1