summaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-06 21:33:41 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-06 21:33:41 +0100
commit7c623cac4939fb36916c029609dd22e3dec0a014 (patch)
treedaf4aad9a30418e1b7cee15ffd1b5a58785ea81a /kernel/trace/trace.c
parentMerge tag 'devicetree-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
parentRevert "ARM: dts: twl4030: Add iio properties for bci subnode" (diff)
downloadlinux-7c623cac4939fb36916c029609dd22e3dec0a014.tar.xz
linux-7c623cac4939fb36916c029609dd22e3dec0a014.zip
Merge tag 'for-v4.4-important-fix' of git://git.kernel.org/pub/scm/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"
Diffstat (limited to 'kernel/trace/trace.c')
0 files changed, 0 insertions, 0 deletions