summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cg...Linus Torvalds2012-10-023-35/+4
|\
| * cgroup: Assign subsystem IDs during compile timeDaniel Wagner2012-09-143-35/+0
| * cgroup: net_prio: Do not define task_netpioidx() when not selectedDaniel Wagner2012-09-141-0/+2
| * cgroup: net_cls: Do not define task_cls_classid() when not selectedDaniel Wagner2012-09-141-0/+2
* | Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wqLinus Torvalds2012-10-028-24/+14
|\ \
| * | workqueue: use mod_delayed_work() instead of __cancel + queueTejun Heo2012-08-211-15/+6
| * | workqueue: make deferrable delayed_work initializer names consistentTejun Heo2012-08-213-3/+3
| * | workqueue: deprecate flush[_delayed]_work_sync()Tejun Heo2012-08-202-2/+2
| * | workqueue: use mod_delayed_work() instead of cancel + queueTejun Heo2012-08-132-4/+3
* | | Merge tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/ttyLinus Torvalds2012-10-015-203/+205
|\ \ \
| * \ \ Merge 3.6-rc6 into tty-nextGreg Kroah-Hartman2012-09-1650-186/+291
| |\ \ \
| * | | | serial: add a new helper functionHuang Shijie2012-09-052-3/+3
| * | | | Merge 3.6-rc3 into tty-nextGreg Kroah-Hartman2012-08-2775-310/+686
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | TTY: ircomm_tty, add tty installJiri Slaby2012-08-131-16/+25
| * | | | TTY: use tty_port_register_deviceJiri Slaby2012-08-131-2/+2
| * | | | tty: localise the lockAlan Cox2012-08-101-2/+2
| * | | | Merge tty-next into 3.6-rc1Greg Kroah-Hartman2012-08-06448-17668/+25490
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | tty: move the termios object into the ttyAlan Cox2012-07-163-12/+12
| * | | | tty: revert incorrectly applied lock patchAlan Cox2012-07-161-2/+2
| * | | | Merge branch 'v3.6-rc7' into tty-nextGreg Kroah-Hartman2012-07-1651-147/+281
| |\ \ \ \
| * | | | | tty: localise the lockAlan Cox2012-07-061-2/+2
| * | | | | Merge 3.5-rc4 into tty-nextGreg Kroah-Hartman2012-06-2635-174/+246
| |\ \ \ \ \
| * | | | | | TTY: ircomm, use tty_port_close_start helperJiri Slaby2012-06-121-47/+1
| * | | | | | TTY: ircomm, use tty_port_close_end helperJiri Slaby2012-06-121-15/+1
| * | | | | | TTY: ircomm, define carrier routinesJiri Slaby2012-06-121-10/+33
| * | | | | | TTY: ircomm, define local tty_portJiri Slaby2012-06-121-53/+56
| * | | | | | TTY: ircomm, use tty from tty_portJiri Slaby2012-06-124-41/+70
| * | | | | | TTY: ircomm, revamp lockingJiri Slaby2012-06-121-20/+18
| * | | | | | TTY: ircomm, use flags from tty_portJiri Slaby2012-06-123-30/+31
| * | | | | | TTY: ircomm, use open counts from tty_portJiri Slaby2012-06-121-21/+21
| * | | | | | TTY: ircomm, use close times from tty_portJiri Slaby2012-06-122-8/+6
| * | | | | | TTY: ircomm, add tty_portJiri Slaby2012-06-122-11/+12
* | | | | | | Merge tag 'driver-core-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-10-011-7/+13
|\ \ \ \ \ \ \
| * | | | | | | device and dynamic_debug: Use dev_vprintk_emit and dev_printk_emitJoe Perches2012-09-171-10/+6
| * | | | | | | netdev_printk/netif_printk: Remove a superfluous logging colonJoe Perches2012-09-171-1/+1
| * | | | | | | netdev_printk/dynamic_netdev_dbg: Directly call printk_emitJoe Perches2012-09-171-7/+17
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-10-011-1/+1
|\ \ \ \ \ \ \
| * | | | | | | treewide: fix comment/printk/variable typosAnatol Pomozov2012-09-011-1/+1
* | | | | | | | inetpeer: fix token initializationNicolas Dichtel2012-09-271-1/+4
* | | | | | | | l2tp: fix return value checkWei Yongjun2012-09-271-6/+6
* | | | | | | | Merge branch 'master' of git://1984.lsi.us.es/nfDavid S. Miller2012-09-271-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | netfilter: xt_limit: have r->cost != 0 case workJan Engelhardt2012-09-261-4/+4
* | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-09-2510-39/+71
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ipv6: mip6: fix mip6_mh_filter()Eric Dumazet2012-09-251-9/+11
| * | | | | | | | | Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2012-09-252-8/+12
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | batman-adv: Fix symmetry check / route flapping in multi interface setupsLinus Lüssing2012-09-231-6/+7
| | * | | | | | | | | batman-adv: Fix change mac address of soft iface.Def2012-09-231-2/+5
| * | | | | | | | | | ipv6: raw: fix icmpv6_filter()Eric Dumazet2012-09-251-11/+10
| * | | | | | | | | | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2012-09-244-4/+28
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-09-224-4/+28
| | |\ \ \ \ \ \ \ \ \