summaryrefslogtreecommitdiff
path: root/kernel/trace/power-traces.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-23 05:35:27 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-23 05:35:27 +0300
commit77ed402b7f53cbe50ae8384a172a5b9713020400 (patch)
tree43c8aa1a8fb4245e38ed1f22c99c5bc88c7017da /kernel/trace/power-traces.c
parent21f9debf74c3ae8fdd26fd2bc3c0169a08eba6b4 (diff)
parent44156affd1844bdfd90cc791cf5fdb6f9a04e238 (diff)
downloadlinux-77ed402b7f53cbe50ae8384a172a5b9713020400.tar.xz
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu update from Greg Ungerer: "Only a single change to update my email address in the MAINTAINERS file" * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: change m68knommu maintainer email address
Diffstat (limited to 'kernel/trace/power-traces.c')
0 files changed, 0 insertions, 0 deletions