diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-12-14 11:13:46 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-12-14 11:13:46 +0000 |
| commit | 41884629fe579bde263dfc3d1284d0f5c7af7d1a (patch) | |
| tree | ba6baec7832af7ffd13a5e191a895f13c7fec31e /include/clocksource | |
| parent | 9388093db44356af911adf3d355b7544a13a63cd (diff) | |
| parent | 8478132a8784605fe07ede555f7277d989368d73 (diff) | |
| parent | 76fb051d42945d142fe265b6ec79e06aa9cfb250 (diff) | |
| parent | e642873dcce49f0c2b4df1b82283bc39775dce2d (diff) | |
| download | linux-41884629fe579bde263dfc3d1284d0f5c7af7d1a.tar.bz2 | |
Merge branches 'clkdev', 'fixes', 'misc' and 'sa1100-base' into for-linus