summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2015-05-287-11/+43
|\
| * ip_vti/ip6_vti: Preserve skb->mark after rcv_cb callAlexander Duyck2015-05-282-4/+14
| * xfrm: Override skb->mark with tunnel->parm.i_key in xfrm_inputAlexander Duyck2015-05-281-1/+16
| * ip_vti/ip6_vti: Do not touch skb->mark on xmitAlexander Duyck2015-05-282-3/+6
| * xfrm: Always zero high-order sequence number bitsHerbert Xu2015-05-211-0/+2
| * esp6: Use high-order sequence number bits for IV generationHerbert Xu2015-05-131-1/+2
| * esp4: Use high-order sequence number bits for IV generationHerbert Xu2015-05-131-1/+2
| * xfrm: fix a race in xfrm_state_lookup_byspiLi RongQing2015-04-291-1/+1
* | via-rhine: Resigning as maintainerRoger Luethi2015-05-281-2/+1
* | Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6Linus Torvalds2015-05-2713-74/+194
|\ \
| * | CIFS: Fix race condition on RFC1002_NEGATIVE_SESSION_RESPONSEFederico Sauter2015-05-201-1/+2
| * | Fix to convert SURROGATE PAIRNakajima Akira2015-05-201-46/+136
| * | cifs: potential missing check for posix_lock_file_waitChengyu Song2015-05-201-2/+2
| * | Fix to check Unique id and FileType when client refer file directly.Nakajima Akira2015-05-201-0/+25
| * | CIFS: remove an unneeded NULL checkDan Carpenter2015-05-201-1/+1
| * | [cifs] fix null pointer checkSteve French2015-05-201-1/+1
| * | Fix that several functions handle incorrect value of mapcharsNakajima Akira2015-05-109-23/+25
| * | cifs: Don't replace dentries for dfs mountsSachin Prabhu2015-05-101-0/+2
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2015-05-2737-170/+351
|\ \ \
| * | | sctp: Fix mangled IPv4 addresses on a IPv6 listening socketJason Gunthorpe2015-05-271-2/+5
| * | | net_sched: invoke ->attach() after setting dev->qdiscWANG Cong2015-05-271-4/+6
| * | | xen-netfront: properly destroy queues when removing deviceDavid Vrabel2015-05-271-13/+2
| * | | mlx4_core: Fix fallback from MSI-X to INTxBenjamin Poirier2015-05-271-2/+7
| * | | xen/netback: Properly initialize credit_bytesRoss Lagerwall2015-05-271-0/+1
| * | | net: netxen: correct sysfs bin attribute return codeVladimir Zapolskiy2015-05-271-3/+3
| * | | tools: bpf_jit_disasm: fix segfault on disabled debugging log outputDaniel Borkmann2015-05-271-0/+2
| * | | unix/caif: sk_socket can disappear when state is unlockedMark Salyzyn2015-05-262-0/+16
| * | | amd-xgbe-phy: Fix initial mode when autoneg is disabledLendacky, Thomas2015-05-261-3/+42
| * | | Merge tag 'mac80211-for-davem-2015-05-26' of git://git.kernel.org/pub/scm/lin...David S. Miller2015-05-267-65/+100
| |\ \ \
| | * | | mac80211: fix AP_VLAN crypto tailroom calculationMichal Kazior2015-05-204-9/+83
| | * | | mac80211: don't split remain-on-channel for coalescingJohannes Berg2015-05-202-54/+11
| | * | | mac80211: don't use napi_gro_receive() outside NAPI contextJohannes Berg2015-05-192-2/+6
| * | | | Merge branch 'phyter-bug-fixes'David S. Miller2015-05-251-4/+19
| |\ \ \ \
| | * | | | net: dp83640: fix improper double spin locking.Richard Cochran2015-05-251-2/+2
| | * | | | net: dp83640: reinforce locking rules.Richard Cochran2015-05-251-1/+16
| | * | | | net: dp83640: fix broken calibration routine.Richard Cochran2015-05-251-1/+1
| |/ / / /
| * | | | net: stmmac: create one debugfs dir per net-deviceMathieu Olivari2015-05-252-23/+59
| * | | | net/ibm/emac: fix size of emac dump memory areasIvan Mikhaylov2015-05-252-15/+8
| * | | | Merge tag 'wireless-drivers-for-davem-2015-05-25' of git://git.kernel.org/pub...David S. Miller2015-05-2512-33/+73
| |\ \ \ \
| | * \ \ \ Merge tag 'iwlwifi-for-kalle-2015-05-21' of https://git.kernel.org/pub/scm/li...Kalle Valo2015-05-2211-30/+69
| | |\ \ \ \
| | | * | | | iwlwifi: mvm: avoid use-after-free on iwl_mvm_d0i3_enable_tx()Eliad Peller2015-05-211-2/+4
| | | * | | | iwlwifi: mvm: clean net-detect info if device was reset during suspendLuciano Coelho2015-05-211-4/+5
| | | * | | | iwlwifi: mvm: take the UCODE_DOWN reference when resumingLuciano Coelho2015-05-211-1/+8
| | | * | | | iwlwifi: mvm: BT Coex - duplicate the command if sent ASYNCEmmanuel Grumbach2015-05-211-1/+1
| | | * | | | iwlwifi: nvm: force mac from otp in case nvm mac is reservedLiad Kaufman2015-05-211-1/+10
| | | * | | | iwlwifi: mvm: Free fw_status after use to avoid memory leakHaim Dreyfuss2015-05-211-1/+3
| | | * | | | iwlwifi: mvm: fix MLME triggerEmmanuel Grumbach2015-05-151-3/+0
| | | * | | | iwlwifi: pcie: don't disable the busmaster DMA clock for family 8000Avri Altman2015-05-151-3/+5
| | | * | | | iwlwifi: 7000: modify the firmware name for 3165Emmanuel Grumbach2015-05-152-8/+9
| | | * | | | iwlwifi: mvm: forbid MIMO on devices that don't support itEmmanuel Grumbach2015-05-104-6/+24