summaryrefslogtreecommitdiffstats
path: root/include/uapi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://1984.lsi.us.es/nf-nextDavid S. Miller2013-02-192-1/+6
|\
| * netfilter: xt_CT: add alias flagPablo Neira Ayuso2013-02-051-1/+5
| * netfilter: xt_conntrack: Add flag to support aliasesJozsef Kadlecsik2013-02-051-0/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net into netDavid S. Miller2013-02-191-17/+8Star
|\ \
| * | unbreak automounter support on 64-bit kernel with 32-bit userspace (v2)Helge Deller2013-02-081-17/+8Star
* | | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2013-02-181-5/+269
|\ \ \
| * \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-02-181-5/+269
| |\ \ \
| | * | | nl80211: renumber NL80211_FEATURE_FULL_AP_CLIENT_STATEJohannes Berg2013-02-151-1/+2
| | * | | cfg80211: Pass station (extended) capability info to kernelJouni Malinen2013-02-151-0/+10
| | * | | cfg80211: advertise extended capabilities to userspaceJohannes Berg2013-02-151-0/+9
| | * | | nl80211: advertise HT/VHT channel limitationsJohannes Berg2013-02-151-0/+17
| | * | | nl80211/cfg80211: add radar detection command/eventSimon Wunderlich2013-02-151-0/+61
| | * | | cfg80211: configuration for WoWLAN over TCPJohannes Berg2013-02-131-0/+125
| | * | | nl80211: add packet offset information for wowlan patternAmitkumar Karwar2013-02-131-3/+9
| | * | | nl80211: minor correction in sample wowlan mask calculationAmitkumar Karwar2013-02-121-1/+1
| | * | | cfg80211: expand per-station byte counters to 64bitVladimir Kondratiev2013-02-041-0/+4
| | * | | cfg80211/mac80211: support reporting wakeup reasonJohannes Berg2013-01-311-0/+31
| | * | | Merge remote-tracking branch 'wireless-next/master' into HEADJohannes Berg2013-01-291-13/+24
| | |\ \ \
* | | | | | VSOCK: Remove hypervisor-only socket optionAndy King2013-02-181-8/+0Star
|/ / / / /
* | | | | bridge: use __u16 in if_bridge.hCong Wang2013-02-141-2/+2
* | | | | bridge: Separate egress policy bitmapVlad Yasevich2013-02-141-0/+1
* | | | | bridge: Add vlan support to static neighborsVlad Yasevich2013-02-141-0/+1
* | | | | bridge: Add the ability to configure pvidVlad Yasevich2013-02-141-0/+1
* | | | | bridge: Dump vlan information from a bridge portVlad Yasevich2013-02-141-0/+1
* | | | | bridge: Add netlink interface to configure vlans on bridge portsVlad Yasevich2013-02-141-0/+9
* | | | | tcp: set and get per-socket timestampAndrey Vagin2013-02-131-0/+1
* | | | | net/8021q: Implement Multiple VLAN Registration Protocol (MVRP)David Ward2013-02-112-0/+2
* | | | | VSOCK: Introduce VM SocketsAndy King2013-02-111-0/+171
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-02-091-0/+6
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge tag 'for-usb-linus-2012-01-24' of git://git.kernel.org/pub/scm/linux/ke...Greg Kroah-Hartman2013-01-251-0/+6
| |\ \ \ \
| | * | | | usb: Using correct way to clear usb3.0 device's remote wakeup feature.Lan Tianyu2013-01-241-0/+6
* | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-02-081-2/+49
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-01-301-2/+49
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | |
| | * | | cfg80211/nl80211: add API for MAC address ACLsVasanthakumar Thiagarajan2013-01-251-2/+49
* | | | | wanrouter: delete now orphaned header content, files/driversPaul Gortmaker2013-02-011-439/+4Star
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-01-291-1/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge tag 'tty-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2013-01-181-1/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | 8250/16?50: Add support for Broadcom TruManage redirected serial portStephen Hurd2013-01-171-1/+2
* | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-01-282-16/+93
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-01-221-3/+53
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | cfg80211: check radar interface combinationsSimon Wunderlich2013-01-161-0/+3
| | * | | cfg80211: Allow use_mfp to be specified with the connect commandJouni Malinen2013-01-161-3/+3
| | * | | {cfg,nl}80211: mesh power mode primitives and userspace accessMarco Porsch2013-01-161-0/+47
| * | | | NFC: Change nfc.h licenseLauro Ramos Venancio2013-01-141-13/+10Star
| * | | | NFC: Initial Secure Element APISamuel Ortiz2013-01-101-0/+14
| |/ / /
| * | | nl80211/mac80211: support full station state in AP modeJohannes Berg2013-01-031-0/+16
* | | | Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-nextDavid S. Miller2013-01-281-0/+2
|\ \ \ \
| * | | | can: gw: indicate and count deleted frames due to misconfigurationOliver Hartkopp2013-01-261-0/+1
| * | | | can: gw: make routing to the incoming CAN interface configurableOliver Hartkopp2013-01-261-0/+1
* | | | | Merge branch 'master' of git://1984.lsi.us.es/nf-nextDavid S. Miller2013-01-275-0/+34
|\ \ \ \ \ | |/ / / / |/| | | |