diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-21 10:26:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-21 10:26:24 -0800 |
| commit | 707b4f493e77638387f29d5ea35e383c418e710d (patch) | |
| tree | dc80dbbc8f52e30803caf023b9d53cb2133b63f3 /fs/ncpfs/file.c | |
| parent | 4143fc83bb0c05a4e2042d78e18a75156e914260 (diff) | |
| parent | 3da6d49e847128378c30292848125cc3e207e5f7 (diff) | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"Two timer fixlets from Arnd:
- Use proper constant size in the FSL timer driver
- Prevent a build error for legacy platforms"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource: Disallow drivers for ARCH_USES_GETTIMEOFFSET
clocksource/fsl: Avoid harmless 64-bit warnings
Diffstat (limited to 'fs/ncpfs/file.c')
0 files changed, 0 insertions, 0 deletions