diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-18 17:38:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-18 17:38:09 -0800 |
| commit | 2763f92f858f7c4c3198335c0542726eaed07ba3 (patch) | |
| tree | d5fe4eb838ae3fb0816fecb855d5595a35045334 /net/ipv6/ip6_output.c | |
| parent | Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm (diff) | |
| parent | ARM: multi_v7_defconfig: enable Qualcomm RPMCC (diff) | |
| download | linux-dev-2763f92f858f7c4c3198335c0542726eaed07ba3.tar.xz linux-dev-2763f92f858f7c4c3198335c0542726eaed07ba3.zip | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann:
"Two more bugfixes that came in during this week:
- a defconfig change to enable a vital driver used on some Qualcomm
based phones. This was already queued for 4.11, but the maintainer
asked to have it in 4.10 after all.
- a regression fix for the reset controller framework, this got
broken by a typo in the 4.10 merge window"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: multi_v7_defconfig: enable Qualcomm RPMCC
reset: fix shared reset triggered_count decrement on error
Diffstat (limited to 'net/ipv6/ip6_output.c')
0 files changed, 0 insertions, 0 deletions