diff options
author | Gary S. Robertson <gary.robertson@linaro.org> | 2013-12-20 15:09:34 -0600 |
---|---|---|
committer | Gary S. Robertson <gary.robertson@linaro.org> | 2013-12-20 15:09:34 -0600 |
commit | 7677dd36c47b788c3ff6c6ef70f326dd6ef5b328 (patch) | |
tree | 81f039740bc0d0ae986673ab58dc9cacb1ad1fb2 /arch/arm/mach-shmobile/board-mackerel.c | |
parent | ddd77d03f7235dc5e1d9137cdb7fc990e174e355 (diff) | |
parent | 05bcf8f867f4af11c93395d4a6dd1dd52d8904ea (diff) |
Merge tag 'v3.10.24' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lng
This is the 3.10.24 stable release
Conflicts:
kernel/time/clockevents.c
kernel/time/tick-common.c
kernel/time/tick-internal.h
Diffstat (limited to 'arch/arm/mach-shmobile/board-mackerel.c')
0 files changed, 0 insertions, 0 deletions