summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* ipv4: Early TCP socket demux.David S. Miller2012-06-194-2/+6
* inet: Sanitize inet{,6} protocol demux.David S. Miller2012-06-191-2/+5
* team: add port_[enabled/disabled] mode callbacksJiri Pirko2012-06-191-0/+2
* team: allow async option changesJiri Pirko2012-06-191-0/+3
* team: push array_index and port into separate structureJiri Pirko2012-06-191-2/+7
* team: introduce array optionsJiri Pirko2012-06-191-0/+3
* team: add mode priv to portJiri Pirko2012-06-191-0/+2
* team: make team_mode struct constJiri Pirko2012-06-191-3/+2
* Merge branch 'master' of git://gitorious.org/linux-can/linux-can-nextDavid S. Miller2012-06-195-17/+85
|\
| * candev: add/update helpers for CAN FDOliver Hartkopp2012-06-191-8/+25
| * canfd: add support for CAN FD in CAN_RAW socketsOliver Hartkopp2012-06-191-1/+2
| * canfd: add support for CAN FD in PF_CAN coreOliver Hartkopp2012-06-191-2/+2
| * canfd: add new data structures and constantsOliver Hartkopp2012-06-192-6/+56
* | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2012-06-196-212/+298
|\ \ | |/ |/|
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-06-196-212/+298
| |\
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-06-132-0/+12
| | |\
| | | * Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-06-131-0/+6
| | | |\
| | | | * mac80211: add some missing kernel-docJohannes Berg2012-06-091-0/+6
| | | * | Bluetooth: Add support for encryption key refreshJohan Hedberg2012-06-081-0/+6
| | | |/
| | * | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-06-135-212/+286
| | |\ \
| | | * | Bluetooth: Create empty l2cap ops functionGustavo Padovan2012-06-051-0/+12
| | | * | Bluetooth: Rename L2CAP_LE_DEFAULT_MTUAndre Guedes2012-06-051-1/+1
| | | * | Bluetooth: Remove unused HCI timeouts definitionsSzymon Janc2012-06-051-2/+0
| | | * | Bluetooth: A2MP: Manage incoming connectionsAndrei Emeltchenko2012-06-051-0/+4
| | | * | Bluetooth: A2MP: Handling fixed channelsAndrei Emeltchenko2012-06-051-0/+1
| | | * | Bluetooth: A2MP: Process A2MP Discover RequestAndrei Emeltchenko2012-06-053-0/+18
| | | * | Bluetooth: A2MP: Define A2MP status codesAndrei Emeltchenko2012-06-051-0/+10
| | | * | Bluetooth: A2MP: Definitions for A2MP commandsAndrei Emeltchenko2012-06-051-0/+73
| | | * | Bluetooth: A2MP: Build and Send msg helpersAndrei Emeltchenko2012-06-051-0/+7
| | | * | Bluetooth: A2MP: AMP Manager basic functionsAndrei Emeltchenko2012-06-052-0/+31
| | | * | Bluetooth: A2MP: Create A2MP channelAndrei Emeltchenko2012-06-051-0/+6
| | | * | Bluetooth: Add l2cap_chan->ops->ready()Andrei Emeltchenko2012-06-051-0/+1
| | | * | Bluetooth: Move clean up code and set of SOCK_ZAPPED to l2cap_sock.cAndrei Emeltchenko2012-06-051-0/+1
| | | * | Bluetooth: Use chan as parameters for l2cap chan opsGustavo Padovan2012-06-051-4/+6
| | | * | Bluetooth: Define HCI AMP cmd structAndrei Emeltchenko2012-06-051-0/+81
| | | * | Bluetooth: Define and use PSM identifiersAndrei Emeltchenko2012-06-051-0/+4
| | | * | Bluetooth: Define L2CAP conf continuation flagAndrei Emeltchenko2012-06-051-0/+3
| | | * | Bluetooth: Remove unnecessary headers includeGustavo Padovan2012-06-053-5/+0
| | | * | Bluetooth: Fix coding style in include/net/bluetoothGustavo Padovan2012-06-053-19/+23
| | | * | Bluetooth: Use defined link key sizeAndrei Emeltchenko2012-06-052-3/+5
| | | * | Bluetooth: Rename HCI_QUIRK_NO_RESET to HCI_QUIRK_RESET_ON_CLOSESzymon Janc2012-06-051-1/+1
| | | * | Bluetooth: Fix trailing whitespaces in license textGustavo Padovan2012-06-051-6/+6
| | | * | Bluetooth: Remove unused ERTM control field macrosMat Martineau2012-06-051-168/+0
| | | * | Bluetooth: Check rules when setting retransmit or monitor timersMat Martineau2012-06-051-4/+0
| | | * | Bluetooth: Remove receive code that has been supercededMat Martineau2012-06-051-8/+0
| | | * | Bluetooth: Fix early return from l2cap_chan_delMat Martineau2012-06-051-0/+1
| | | |/
* | | | netfilter: fix missing symbols if CONFIG_NETFILTER_NETLINK_QUEUE_CT unsetPablo Neira Ayuso2012-06-181-1/+1
* | | | netfilter: nfnetlink_queue: fix compilation with NF_CONNTRACK disabledPablo Neira Ayuso2012-06-191-0/+43
* | | | Merge branch 'master' of git://1984.lsi.us.es/nf-nextDavid S. Miller2012-06-1614-39/+121
|\ \ \ \
| * | | | netfilter: add user-space connection tracking helper infrastructurePablo Neira Ayuso2012-06-166-1/+71