summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-nextJohn W. Linville2012-06-264-24/+15
|\
| * nl80211: specify RSSI threshold in scheduled scanThomas Pedersen2012-06-262-0/+8
| * mac80211: clean up debuggingJohannes Berg2012-06-241-24/+0
| * ieee80211: more OUI type definitions for WLAN_OUI_MICROSOFTAvinash Patil2012-06-211-0/+2
| * mac80211: add command to get current rssiVictor Goldenshtein2012-06-211-0/+5
* | Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-nextJohn W. Linville2012-06-223-76/+216
|\|
| * {nl,cfg,mac}80211: implement dot11MeshHWMPconfirmationIntervalChun-Yeow Yeoh2012-06-182-0/+9
| * mac80211: implement the proactive PREQ generationChun-Yeow Yeoh2012-06-141-0/+42
| * {nl,cfg,mac}80211: implement dot11MeshHWMProotInterval and dot11MeshHWMPactiv...Chun-Yeow Yeoh2012-06-142-0/+18
| * cfg80211/nl80211: fix kernel-docJohannes Berg2012-06-132-9/+32
| * nl80211: fix sched scan match attribute nameJohannes Berg2012-06-131-1/+4
| * ieee80211: definitions for Microsoft Vendor OUI and WPA OUI typeAvinash Patil2012-06-121-0/+2
| * {nl,cfg,mac}80211: fix the coding style related to mesh parametersChun-Yeow Yeoh2012-06-113-56/+60
| * cfg80211: add missing kernel-doc for mesh configuration structureChun-Yeow Yeoh2012-06-111-10/+49
* | 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
| |/ /
* | | Merge tag 'nfc-next-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s...John W. Linville2012-06-114-5/+27
|\ \ \ | |_|/ |/| |
| * | NFC: Introduce target mode rx data callbackSamuel Ortiz2012-06-041-0/+1
| * | NFC: Introduce target mode tx opsSamuel Ortiz2012-06-041-1/+2
| * | NFC: Set the NFC device RF mode appropriatelySamuel Ortiz2012-06-042-1/+2
| * | NFC: Add target mode activation netlink eventSamuel Ortiz2012-06-042-0/+11
OpenPOWER on IntegriCloud