diff options
author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-05-16 16:08:32 +0200 |
---|---|---|
committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-05-16 16:08:32 +0200 |
commit | 3f04e3d3eb77ac9df70619b9c87da71b0eeddc36 (patch) | |
tree | cf1cbadc390888d1910a81ffc40161f783363075 /drivers/pcmcia/yenta_socket.c | |
parent | ARM: sun6i: a31: Add support for the High Speed Timers (diff) | |
parent | timer_stats/doc: Fix /proc/timer_stats documentation (diff) | |
download | linux-3f04e3d3eb77ac9df70619b9c87da71b0eeddc36.tar.xz linux-3f04e3d3eb77ac9df70619b9c87da71b0eeddc36.zip |
Merge remote-tracking branch 'tip/timers/core/timers/core' into clockevents/3.16
Diffstat (limited to 'drivers/pcmcia/yenta_socket.c')
0 files changed, 0 insertions, 0 deletions