diff options
| author | Olof Johansson <olof@lixom.net> | 2014-12-04 23:33:16 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-12-04 23:33:16 -0800 |
| commit | fb3268b0081e4a9a8baa369b8e882874dcd5f955 (patch) | |
| tree | fc576514c1a4e2c520986aaf010c4b09c1d23f15 /block/bsg-lib.c | |
| parent | 83b63c699b53050a00a3ffb6c43663c4647dac30 (diff) | |
| parent | 65b5732d241b8b39e07653794eefffd0d8028cbb (diff) | |
Merge branch 'clocksource/physical-timers' into next/dt
These are a pre-req to get rk3288 SMP to work with some firmwares, so merge
it in here as well as in next/drivers.
* clocksource/physical-timers:
clocksource: arch_timer: Allow the device tree to specify uninitialized timer registers
clocksource: arch_timer: Fix code to use physical timers when requested
Diffstat (limited to 'block/bsg-lib.c')
0 files changed, 0 insertions, 0 deletions