summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* team: fix error path in team_nl_fill_options_get()Jiri Pirko2012-06-191-1/+1
* team: allow async option changesJiri Pirko2012-06-192-0/+21
* team: push array_index and port into separate structureJiri Pirko2012-06-192-27/+50
* team: comments: s/net\/drivers\/team/drivers\/net\/team/Jiri Pirko2012-06-193-3/+3
* team: introduce array optionsJiri Pirko2012-06-192-23/+55
* team: allow read/write-only optionsJiri Pirko2012-06-191-0/+4
* team: lb: push hash counting into separate functionJiri Pirko2012-06-191-7/+16
* team: add mode priv to portJiri Pirko2012-06-192-1/+4
* team: for nomode use dummy struct team_modeJiri Pirko2012-06-191-8/+21
* team: make team_mode struct constJiri Pirko2012-06-195-23/+43
* Merge branch 'master' of git://gitorious.org/linux-can/linux-can-nextDavid S. Miller2012-06-1913-64/+664
|\
| * canfd: update documentation according to CAN FD extensionsOliver Hartkopp2012-06-191-8/+146
| * vcan: add CAN FD supportOliver Hartkopp2012-06-191-7/+20
| * candev: add/update helpers for CAN FDOliver Hartkopp2012-06-192-9/+59
| * canfd: add support for CAN FD in CAN_RAW socketsOliver Hartkopp2012-06-192-5/+48
| * canfd: add support for CAN FD in PF_CAN coreOliver Hartkopp2012-06-192-29/+84
| * canfd: add new data structures and constantsOliver Hartkopp2012-06-193-6/+63
| * c_can_pci: generic module for C_CAN/D_CAN on PCIFederico Vaga2012-06-193-0/+244
* | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2012-06-1986-2966/+4743
|\ \
| * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-06-1986-2966/+4743
| |\ \
| | * | iwlwifi: unlock on error pathDan Carpenter2012-06-141-1/+3
| | * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-06-1314-28/+115
| | |\ \
| | | * | ath9k: Fix softlockup in AR9485Mohammed Shafi Shajakhan2012-06-131-0/+9
| | | * | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-06-136-4/+18
| | | |\ \
| | | | * | 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-092-0/+8
| | | * | | mwifiex: fix incorrect privacy setting in beacon and probe responseAvinash Patil2012-06-121-0/+11
| | | * | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-06-115-5/+85
| | | |\ \ \
| | | | * | | Bluetooth: Add support for encryption key refreshJohan Hedberg2012-06-082-0/+54
| | | | * | | 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
| | | * | | | rndis_wlan: fix matching bssid check in rndis_check_bssid_list()Jussi Kivilinna2012-06-111-1/+1
| | | * | | | ath9k: remove incompatible IBSS interface check in change_ifaceMohammed Shafi Shajakhan2012-06-111-9/+0
| | | * | | | ath9k: Fix a WARNING on suspend/resume with IBSSMohammed Shafi Shajakhan2012-06-111-9/+0
| | | | |/ / | | | |/| |
| | * | | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-06-1338-1683/+2774
| | |\ \ \ \
| | | * | | | 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-052-20/+15
| | | * | | | Bluetooth: Rename L2CAP_LE_DEFAULT_MTUAndre Guedes2012-06-052-2/+2
| | | * | | | 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
OpenPOWER on IntegriCloud