Merge tag 'for-v4.4-important-fix' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Nov 2015 20:33:41 +0000 (12:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Nov 2015 20:33:41 +0000 (12:33 -0800)
commit7c623cac4939fb36916c029609dd22e3dec0a014
treedaf4aad9a30418e1b7cee15ffd1b5a58785ea81a
parent9bbd4b9f38f56b4ee2c8ff268a1104ff38333e90
parent829a7da03fd5f94c3a3ee1f8e22371e81cf73c79
Merge tag 'for-v4.4-important-fix' of git://git./linux/kernel/git/sre/linux-power-supply

Pull power supply fix from Sebastian Reichel:
 "Just a single revert for a patch, that I should not have queued.

  Detailed description is inside the patch.  It's totally my fault, that
  this happened, sorry about that :("

* tag 'for-v4.4-important-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  Revert "ARM: dts: twl4030: Add iio properties for bci subnode"