| commit | 3ff32a0def6e0d2e21a6c5ad1b00726592774018 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Sep 03 15:28:50 2015 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Sep 03 15:28:50 2015 +0100 |
| tree | af683b2cb62f7e5ee18cb109d15dcfd43769b984 | |
| parent | 40d3f02851577da27b5cbb1538888301245ef1e7 [diff] | |
| parent | 81497953e37bc28209d9a647171ea93b4a99fc57 [diff] |
Merge branch 'devel-stable' into for-linus Conflicts: drivers/perf/arm_pmu.c