From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 19 Feb 2017 01:38:09 +0000 (-0800)
Subject: Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2763f92f858f7c4c3198335c0542726eaed07ba3;p=linux.git

Merge tag 'fixes-for-linus' of git://git./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
---

2763f92f858f7c4c3198335c0542726eaed07ba3