diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-04 15:52:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-04 15:52:51 -0700 |
| commit | a45c657f28f82b056173d1afc2e7ed1f1f68829f (patch) | |
| tree | d973960f6b70a3ee60a5ee43892ecee2268e4c43 /include/linux/timerqueue.h | |
| parent | Merge tag 'please-pull-misc-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux (diff) | |
| parent | m68k/sun3: Remove define statement no longer needed (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k changes from Geert Uytterhoeven:
"Extremely non-spectacular changes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/sun3: Remove define statement no longer needed
zorro: Use ARRAY_SIZE
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions