diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-03 14:28:50 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-03 14:28:50 (GMT) |
| commit | 3ff32a0def6e0d2e21a6c5ad1b00726592774018 (patch) | |
| tree | af683b2cb62f7e5ee18cb109d15dcfd43769b984 /drivers/watchdog/intel_scu_watchdog.c | |
| parent | 40d3f02851577da27b5cbb1538888301245ef1e7 (diff) | |
| parent | 81497953e37bc28209d9a647171ea93b4a99fc57 (diff) | |
| download | linux-3ff32a0def6e0d2e21a6c5ad1b00726592774018.tar.xz | |
Merge branch 'devel-stable' into for-linus
Conflicts:
drivers/perf/arm_pmu.c
Diffstat (limited to 'drivers/watchdog/intel_scu_watchdog.c')
0 files changed, 0 insertions, 0 deletions