summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* aeroflex/greth: fix warning about unused variableSam Ravnborg2016-05-201-1/+1
* openprom: fix warningSam Ravnborg2016-05-201-24/+16
* Merge branch 'sparc32-cosmetic-changes'David S. Miller2016-05-2011-34/+33
|\
| * sparc32: drop superfluous cast in calls to __nocache_pa()Sam Ravnborg2016-05-202-3/+3
| * sparc32: fix build with STRICT_MM_TYPECHECKSSam Ravnborg2016-05-205-11/+14
| * sparc32: use proper prototype for trapbaseSam Ravnborg2016-05-203-5/+3
| * sparc32: drop local prototype in kgdb_32Sam Ravnborg2016-05-201-2/+2
| * sparc32: drop hardcoding trap_level in kgdb_trapSam Ravnborg2016-05-204-14/+12
|/
* Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac...Linus Torvalds2016-05-023-5/+17
|\
| * udf: Fix conversion of 'dstring' fields to UTF8Andrew Gabbasov2016-04-253-5/+17
* | Merge tag 'gpio-v4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linu...Linus Torvalds2016-05-022-60/+7
|\ \
| * | gpiolib-acpi: Duplicate con_id string when adding it to the crs lookup listVille Syrjälä2016-04-301-1/+1
| * | Revert "gpio: rcar: Fine-grained Runtime PM support"Linus Walleij2016-04-121-17/+6
| * | Revert "gpio: rcar: Add Runtime PM handling for interrupts"Linus Walleij2016-04-121-42/+0
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2016-05-0247-194/+384
|\ \ \
| * | | gre: do not pull header in ICMP error processingJiri Benc2016-05-021-3/+8
| * | | net: Implement net_dbg_ratelimited() for CONFIG_DYNAMIC_DEBUG caseTim Bingham2016-05-011-1/+9
| * | | tipc: only process unicast on intended nodeHamish Martin2016-05-011-0/+5
| * | | cxgb3: fix out of bounds readMichal Schmidt2016-05-011-1/+2
| * | | net/smscx5xx: use the device tree for mac addressArnd Bergmann2016-05-012-2/+22
| * | | soreuseport: Fix TCP listener hash collisionCraig Gallek2016-05-011-0/+2
| * | | net: l2tp: fix reversed udp6 checksum flagsWang Shanker2016-05-011-2/+2
| * | | ip_tunnel: fix preempt warning in ip tunnel creation/updatingPaolo Abeni2016-04-291-2/+2
| * | | Merge branch 'bpf-fixes'David S. Miller2016-04-285-38/+73
| |\ \ \
| | * | | samples/bpf: fix trace_output exampleAlexei Starovoitov2016-04-281-1/+0
| | * | | bpf: fix check_map_func_compatibility logicAlexei Starovoitov2016-04-281-25/+40
| | * | | bpf: fix refcnt overflowAlexei Starovoitov2016-04-284-12/+33
| |/ / /
| * | | Merge branch 'cpsw-phy-handle-fixes'David S. Miller2016-04-283-34/+40
| |\ \ \
| | * | | drivers: net: cpsw: use of_phy_connect() in fixed-link caseDavid Rivshin2016-04-281-10/+1
| | * | | dt: cpsw: phy-handle, phy_id, and fixed-link are mutually exclusiveDavid Rivshin2016-04-281-3/+3
| | * | | drivers: net: cpsw: don't ignore phy-mode if phy-handle is usedDavid Rivshin2016-04-281-2/+8
| | * | | drivers: net: cpsw: fix segfault in case of bad phy-handleDavid Rivshin2016-04-281-13/+22
| | * | | drivers: net: cpsw: fix parsing of phy-handle DT property in dual_emac configDavid Rivshin2016-04-282-7/+7
| |/ / /
| * | | MAINTAINERS: net: Change maintainer for GRETH 10/100/1G Ethernet MAC device d...Andreas Larsson2016-04-281-1/+1
| * | | gre: reject GUE and FOU in collect metadata modeJiri Benc2016-04-281-0/+5
| * | | Merge branch 'pegasus-sizes'David S. Miller2016-04-281-5/+5
| |\ \ \
| | * | | pegasus: fixes reported packet lengthPetko Manolov2016-04-281-2/+2
| | * | | pegasus: fixes URB buffer allocation size;Petko Manolov2016-04-281-3/+3
| |/ / /
| * | | Merge branch 'gre-lwt-fixes'David S. Miller2016-04-281-6/+8
| |\ \ \
| | * | | gre: build header correctly for collect metadata tunnelsJiri Benc2016-04-281-4/+5
| | * | | gre: do not assign header_ops in collect metadata modeJiri Benc2016-04-281-2/+3
| |/ / /
| * | | Merge tag 'mac80211-for-davem-2016-04-27' of git://git.kernel.org/pub/scm/lin...David S. Miller2016-04-281-2/+2
| |\ \ \
| | * | | mac80211: fix statistics leak if dev_alloc_name() failsJohannes Berg2016-04-271-2/+2
| * | | | net: phy: at803x: only the AT8030 needs a hardware reset on link changeTimur Tabi2016-04-281-22/+18
| * | | | Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2016-04-285-4/+23
| |\ \ \ \
| | * | | | batman-adv: Fix broadcast/ogm queue limit on a removed interfaceLinus Lüssing2016-04-241-0/+6
| | * | | | batman-adv: Reduce refcnt of removed router when updating routeSven Eckelmann2016-04-241-0/+9
| | * | | | batman-adv: Deactivate TO_BE_ACTIVATED hardif on shutdownSven Eckelmann2016-04-241-2/+1
| | * | | | batman-adv: init neigh node last seen fieldMarek Lindner2016-04-241-0/+1
| | * | | | batman-adv: Check skb size before using encapsulated ETH+VLAN headerSven Eckelmann2016-04-241-2/+6