summaryrefslogtreecommitdiff
path: root/drivers/rtc
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-09-03 14:28:50 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-09-03 14:28:50 (GMT)
commit3ff32a0def6e0d2e21a6c5ad1b00726592774018 (patch)
treeaf683b2cb62f7e5ee18cb109d15dcfd43769b984 /drivers/rtc
parent40d3f02851577da27b5cbb1538888301245ef1e7 (diff)
parent81497953e37bc28209d9a647171ea93b4a99fc57 (diff)
downloadlinux-3ff32a0def6e0d2e21a6c5ad1b00726592774018.tar.xz
Merge branch 'devel-stable' into for-linus
Conflicts: drivers/perf/arm_pmu.c
Diffstat (limited to 'drivers/rtc')
0 files changed, 0 insertions, 0 deletions