summaryrefslogtreecommitdiff
path: root/include/soc/tegra/pm.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/soc/tegra/pm.h')
0 files changed, 0 insertions, 0 deletions
7f004bfd3d67a6f'>net/ceph/armor.c parent1c3415a06b1016a596bfe59e0cfee56c773aa958 (diff)parent7a308bb3016f57e5be11a677d15b821536419d36 (diff)
Merge tag 'v4.10-rc5' into for-linus
Sync up with mainline to apply fixup to a commit that came through power supply tree.
Diffstat (limited to 'net/ceph/armor.c')