summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'linus' into sched/core, to resolve conflictIngo Molnar2015-06-02409-1984/+3728
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2015-06-0132-119/+174
| |\
| | * Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2015-06-011-4/+0
| | |\
| | | * Revert "netfilter: ensure number of counters is >0 in do_replace()"Bernhard Thaler2015-06-011-4/+0
| | * | Merge tag 'wireless-drivers-for-davem-2015-06-01' of git://git.kernel.org/pub...David S. Miller2015-06-015-27/+20
| | |\ \
| | | * \ Merge tag 'iwlwifi-for-kalle-2015-05-28' of https://git.kernel.org/pub/scm/li...Kalle Valo2015-05-284-20/+15
| | | |\ \
| | | | * | iwlwifi: nvm: fix otp parsing in 8000 hw familyLiad Kaufman2015-05-281-1/+1
| | | | * | iwlwifi: pcie: fix tracking of cmd_in_flightIlan Peer2015-05-283-19/+14
| | | * | | brcmfmac: avoid null pointer access when brcmf_msgbuf_get_pktid() failsArend van Spriel2015-05-281-7/+5
| | * | | | vti6: Add pmtu handling to vti6_xmit.Steffen Klassert2015-06-011-0/+14
| | * | | | Revert "net: core: 'ethtool' issue with querying phy settings"David S. Miller2015-06-011-9/+1
| | * | | | bnx2x: Move statistics implementation into semaphoresYuval Mintz2015-06-013-11/+20
| | * | | | xen: netback: read hotplug script once at start of day.Ian Campbell2015-06-011-14/+19
| | * | | | xen: netback: fix printf format string warningIan Campbell2015-06-011-1/+1
| | * | | | net: dsa: Properly propagate errors from dsa_switch_setup_oneFlorian Fainelli2015-05-311-2/+2
| | * | | | tcp: fix child sockets to use system default congestion control if not setNeal Cardwell2015-05-313-3/+10
| | * | | | udp: fix behavior of wrong checksumsEric Dumazet2015-05-312-8/+4
| | * | | | sfc: free multiple Rx buffers when requiredDaniel Pieczko2015-05-311-17/+25
| | * | | | Merge branch 'bna-fixes'David S. Miller2015-05-303-6/+9
| | |\ \ \ \
| | | * | | | bna: fix soft lock-up during firmware initialization failureIvan Vecera2015-05-301-2/+2
| | | * | | | bna: remove unreasonable iocpf timer startIvan Vecera2015-05-301-4/+0
| | | * | | | bna: fix firmware loading on big-endian machinesIvan Vecera2015-05-301-0/+7
| | |/ / / /
| | * | | | Merge tag 'mac80211-for-davem-2015-05-28' of git://git.kernel.org/pub/scm/lin...David S. Miller2015-05-301-3/+4
| | |\ \ \ \
| | | * | | | mac80211: Fix mac80211.h docbook commentsJonathan Corbet2015-05-281-3/+4
| | * | | | | bridge: fix br_multicast_query_expired() bugEric Dumazet2015-05-301-1/+1
| | * | | | | 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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparcLinus Torvalds2015-06-0112-59/+282
| |\ \ \ \ \ \ \
| | * | | | | | | sparc: Resolve conflict between sparc v9 and M7 on usage of bit 9 of TTEKhalid Aziz2015-05-316-22/+104
| | * | | | | | | sparc64: pci slots information is not populated in sysfsEric Snowberg2015-05-311-8/+51
| | * | | | | | | sparc: kernel: GRPCI2: Remove a useless memsetChristophe Jaillet2015-05-311-1/+0
| | * | | | | | | sparc64: Setup sysfs to mark LDOM sockets, cores and threads correctlychris hyser2015-04-224-28/+127
| * | | | | | | | Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostLinus Torvalds2015-06-011-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | include/uapi/linux/virtio_balloon.h: include linux/virtio_types.hMikko Rapeli2015-06-011-0/+1
| |/ / / / / / / /
| * | | | | | | | Linux 4.1-rc6v4.1-rc6Linus Torvalds2015-05-311-1/+1
| * | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2015-05-311-4/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | d_walk() might skip too muchAl Viro2015-05-281-4/+4
| * | | | | | | | | Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-armLinus Torvalds2015-05-313-15/+18
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | ARM: 8357/1: perf: fix memory leak when probing PMU PPIsWill Deacon2015-05-181-4/+5
| | * | | | | | | | | ARM: fix missing syscall trace exitRussell King2015-05-151-1/+3
| | * | | | | | | | | ARM: 8356/1: mm: handle non-pmd-aligned end of RAMMark Rutland2015-05-141-10/+10
| * | | | | | | | | | Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf...Linus Torvalds2015-05-317-15/+30
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | MIPS: strnlen_user.S: Fix a CPU_DADDI_WORKAROUNDS regressionMaciej W. Rozycki2015-05-291-2/+13