summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://gitorious.org/linux-can/linux-can-nextDavid S. Miller2012-06-192-31/+135
|\
| * canfd: add support for CAN FD in CAN_RAW socketsOliver Hartkopp2012-06-191-4/+46
| * canfd: add support for CAN FD in PF_CAN coreOliver Hartkopp2012-06-191-27/+82
| * canfd: add new data structures and constantsOliver Hartkopp2012-06-191-0/+7
* | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2012-06-1927-1451/+2555
|\ \ | |/ |/|
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-06-1927-1451/+2555
| |\
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-06-139-9/+91
| | |\
| | | * Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-06-135-4/+12
| | | |\
| | | | * mac80211: stop polling in disassociationDavid Spinadel2012-06-131-2/+2
| | | | * mac80211: check sdata_running on ieee80211_set_bitrate_maskEliad Peller2012-06-131-0/+3
| | | | * cfg80211: fix potential deadlock in regulatoryEliad Peller2012-06-131-1/+1
| | | | * mac80211: add missing kernel-docAshok Nagarajan2012-06-121-0/+3
| | | | * cfg80211: check iface combinations only when iface is runningMichal Kazior2012-06-091-1/+1
| | | | * mac80211: add some missing kernel-docJohannes Berg2012-06-091-0/+2
| | | * | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-06-114-5/+79
| | | |\ \ | | | | |/ | | | |/|
| | | | * Bluetooth: Add support for encryption key refreshJohan Hedberg2012-06-081-0/+48
| | | | * Bluetooth: Fix SMP security elevation from medium to highJohan Hedberg2012-06-081-3/+6
| | | | * Bluetooth: Fix deadlock and crash when SMP pairing times outJohan Hedberg2012-06-081-1/+6
| | | | * Bluetooth: Fix LE pairing completion on connection failureVishal Agarwal2012-06-081-0/+18
| | | | * Bluetooth: Fix SMP pairing method selectionJohan Hedberg2012-06-081-1/+1
| | * | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-06-1322-1442/+2464
| | |\ \ \
| | | * | | Bluetooth: Fix style in hidp codeGustavo Padovan2012-06-091-1/+2
| | | * | | Bluetooth: Remove magic disconnect reasonAndrei Emeltchenko2012-06-051-1/+1
| | | * | | Bluetooth: Fix checking the wrong flag when accepting a socketVinicius Costa Gomes2012-06-051-1/+1
| | | * | | Bluetooth: Filter duplicated reports in LE scanAndre Guedes2012-06-051-0/+1
| | | * | | Bluetooth: Create empty l2cap ops functionGustavo Padovan2012-06-051-20/+3
| | | * | | Bluetooth: Rename L2CAP_LE_DEFAULT_MTUAndre Guedes2012-06-051-1/+1
| | | * | | Bluetooth: Check MTU value in l2cap_sock_setsockopt_oldAndre Guedes2012-06-051-0/+21
| | | * | | Bluetooth: Change default MTU for L2CAP ATT channelAndre Guedes2012-06-051-1/+1
| | | * | | Bluetooth: Fix not removing hci_conn for failed LE connectionAndrzej Kaczmarek2012-06-051-9/+13
| | | * | | Bluetooth: Return proper mgmt state when LE pairing connection failedAndrzej Kaczmarek2012-06-051-1/+8
| | | * | | Bluetooth: Allow only one LE connection attemptAndrzej Kaczmarek2012-06-051-0/+5
| | | * | | Bluetooth: Remove unused err var from l2cap_segment_sdu()Gustavo Padovan2012-06-051-2/+1
| | | * | | Bluetooth: Create function to return the ERTM header sizeGustavo Padovan2012-06-051-14/+11
| | | * | | Bluetooth: Make l2cap_att_channel return voidAndrei Emeltchenko2012-06-051-5/+3
| | | * | | Bluetooth: Make l2cap_conless_channel return voidAndrei Emeltchenko2012-06-051-4/+3
| | | * | | Bluetooth: Make l2cap_data_channel return voidAndrei Emeltchenko2012-06-051-5/+4
| | | * | | Bluetooth: A2MP: Do not reference hci_connAndrei Emeltchenko2012-06-052-3/+3
| | | * | | Bluetooth: Do not check func ready existenceAndrei Emeltchenko2012-06-051-2/+1
| | | * | | Bluetooth: A2MP: Manage incoming connectionsAndrei Emeltchenko2012-06-052-4/+31
| | | * | | Bluetooth: A2MP: Handling fixed channelsAndrei Emeltchenko2012-06-052-2/+18
| | | * | | Bluetooth: A2MP: Process A2MP Command ResponsesAndrei Emeltchenko2012-06-051-0/+12
| | | * | | Bluetooth: A2MP: Process A2MP Disc Physlink RequestAndrei Emeltchenko2012-06-051-0/+36
| | | * | | Bluetooth: A2MP: Process A2MP Create Physlink RequestAndrei Emeltchenko2012-06-051-0/+40
| | | * | | Bluetooth: A2MP: Process A2MP Get AMP Assoc RequestAndrei Emeltchenko2012-06-051-0/+35
| | | * | | Bluetooth: A2MP: Process A2MP Get Info RequestAndrei Emeltchenko2012-06-051-0/+37
| | | * | | Bluetooth: A2MP: Process A2MP Change NotifyAndrei Emeltchenko2012-06-051-0/+19
| | | * | | Bluetooth: A2MP: Process A2MP Discover RequestAndrei Emeltchenko2012-06-051-0/+85
| | | * | | Bluetooth: A2MP: Process A2MP Command RejectAndrei Emeltchenko2012-06-051-0/+19
| | | * | | Bluetooth: A2MP: Process A2MP messagesAndrei Emeltchenko2012-06-051-0/+65
OpenPOWER on IntegriCloud