summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-10-1913-95/+99
|\
| * Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-10-174-24/+35
| |\
| | * mac80211: connect with HT20 if HT40 is not permittedJohannes Berg2012-10-171-10/+20
| | * cfg80211/mac80211: avoid state mishmash on deauthStanislaw Gruszka2012-10-153-11/+7
| | * Merge remote-tracking branch 'wireless/master' into mac80211Johannes Berg2012-10-159607-260369/+611724
| | |\
| | * | mac80211: Fix FC masking in BIP AAD generationJouni Malinen2012-10-011-3/+8
| * | | iwlwifi: fix 6000 series channel switch commandJohannes Berg2012-10-161-15/+24
| * | | net/wireless: ipw2200: Fix panic occurring in ipw_handle_promiscuous_tx()Stanislav Yakovlev2012-10-151-1/+1
| * | | bcma: fix unregistration of coresPiotr Haber2012-10-151-2/+3
| * | | mac80211: use ieee80211_free_txskb in a few more placesFelix Fietkau2012-10-153-5/+5
| * | | brcmfmac: fix end of loop check (signedness bug)Dan Carpenter2012-10-151-2/+2
| * | | brcmfmac: set dongle mode accordingly when interface upFranky Lin2012-10-151-36/+2
| * | | brcmfmac: use control channel in roamed status reportingFranky Lin2012-10-151-6/+20
| * | | brcmfmac: handle all exceptions as an error.Hante Meuleman2012-10-151-1/+1
| * | | mac80211: check if key has TKIP type before updating IVStanislaw Gruszka2012-10-151-1/+2
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto...John W. Linville2012-10-151-2/+4
| |\ \ \
| | * | | Bluetooth: SMP: Fix setting unknown auth_req bitsJohan Hedberg2012-10-121-2/+4
* | | | | Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2012-10-183-10/+27
|\ \ \ \ \
| * | | | | batman-adv: Fix potential broadcast BLA-duplicate-check race conditionLinus Lüssing2012-10-182-5/+16
| * | | | | batman-adv: Fix broadcast packet CRC calculationLinus Lüssing2012-10-182-5/+11
* | | | | | tcp: fix FIONREAD/SIOCINQEric Dumazet2012-10-181-5/+3
* | | | | | net: qmi_wwan: adding more ZTE devicesBjørn Mork2012-10-181-0/+41
* | | | | | netlink: use kfree_rcu() in netlink_release()Eric Dumazet2012-10-181-4/+15
* | | | | | ipv4: Fix flushing of cached routing informationsSteffen Klassert2012-10-181-3/+6
* | | | | | vlan: allow to change type when no vlan device is hooked on netdevJiri Pirko2012-10-181-1/+3
* | | | | | phy: add AT803x driverMatus Ujhelyi2012-10-183-0/+182
* | | | | | usb/ipheth: Add iPhone 5 supportJay Purohit2012-10-181-0/+5
* | | | | | Merge branch 'master' of git://1984.lsi.us.es/nfDavid S. Miller2012-10-184-9/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | netfilter: xt_TEE: don't use destination address found in headerEric Dumazet2012-10-171-0/+1
| * | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/netPablo Neira Ayuso2012-10-178237-190148/+384851
| |\ \ \ \ \
| * | | | | | netfilter: xt_nat: fix incorrect hooks for SNAT and DNAT targetsElison Niven2012-10-151-4/+4
| * | | | | | netfilter: xt_CT: fix timeout setting with IPv6Pablo Neira Ayuso2012-10-151-4/+6
| * | | | | | ipvs: initialize returned data in do_ip_vs_get_ctlArnd Bergmann2012-10-091-1/+2
* | | | | | | apparmor: fix apparmor OOPS in audit_log_untrustedstring+0x1c/0x40John Johansen2012-10-181-1/+1
* | | | | | | Merge tag 'uapi-fixes-20121017' of git://git.infradead.org/users/dhowells/lin...Linus Torvalds2012-10-1738-36/+33
|\ \ \ \ \ \ \
| * | | | | | | UAPI: Make arch/sparc/include/uapi/asm/sigcontext.h non-emptyDavid Howells2012-10-171-0/+4
| * | | | | | | UAPI: Make arch/sh/include/uapi/asm/hw_breakpoint.h non-emptyDavid Howells2012-10-171-0/+4
| * | | | | | | UAPI: Make arch/mn10300/include/uapi/asm/setup.h non-emptyDavid Howells2012-10-171-0/+4
| * | | | | | | UAPI: Put a comment into uapi/asm-generic/kvm_para.h and use it from archesDavid Howells2012-10-175-0/+8
| * | | | | | | UAPI: The tile arch uses the generic ucontext.h fileDavid Howells2012-10-172-3/+3
| * | | | | | | UAPI: Place comments in empty arch Kbuilds to make them non-emptyDavid Howells2012-10-172-0/+2
| * | | | | | | UAPI: Remove empty non-UAPI Kbuild filesDavid Howells2012-10-1723-21/+0
| * | | | | | | UAPI: Remove empty conditionals from include/linux/KbuildDavid Howells2012-10-171-10/+0
| * | | | | | | UAPI: Make uapi/linux/irqnr.h non-emptyDavid Howells2012-10-171-0/+4
| * | | | | | | uapi: Allow automatic generation of uapi/asm/ header filesCatalin Marinas2012-10-172-2/+4
* | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-10-1710-24/+55
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | ipv6: addrconf: fix /proc/net/if_inet6Eric Dumazet2012-10-161-6/+9
| * | | | | | | bnx2x: fix handling mf storage modesDmitry Kravkov2012-10-162-4/+8
| * | | | | | | qeth: fix deadlock between recovery and bonding driverStefan Raspl2012-10-162-10/+12
| * | | | | | | smsgiucv: reestablish IUCV path after resumeHendrik Brueckner2012-10-161-1/+1