aboutsummaryrefslogtreecommitdiffstats
path: root/include/soc
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-06-12 21:18:57 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-06-12 21:18:57 +0100
commit27a513ca8600e96790f9f3a3c3182da947e569d2 (patch)
tree48319c0a53dd76dc2dff6cb15da5c5f145e72cc3 /include/soc
parent970d96f9a81b0dd83ddd8bce0e5e1ba31881c5f5 (diff)
parentbcc8fa83136969c340a8057c44b1d5eb2f4b5295 (diff)
Merge branch 'devel-stable' into for-next
Conflicts: arch/arm/kernel/perf_event_cpu.c
Diffstat (limited to 'include/soc')
0 files changed, 0 insertions, 0 deletions

Privacy Policy