diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 16:27:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 16:27:21 -0700 |
| commit | e1f2084ed200eb31f2c9d1efe70569c76889c980 (patch) | |
| tree | 06b185bb7a13f4ac5862a8dbc05e8dd3453b27b8 /lib/timerqueue.c | |
| parent | e33ab8f275cf6e0e0bf6c9c44149de46222b36cc (diff) | |
| parent | 659e6ed55ff8d617c895c10288644e3e6107834e (diff) | |
| download | op-kernel-dev-e1f2084ed200eb31f2c9d1efe70569c76889c980.zip op-kernel-dev-e1f2084ed200eb31f2c9d1efe70569c76889c980.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
input/atari: Fix mouse movement and button mapping
input/atari: Fix atarimouse init
input/atari: Use the correct mouse interrupt hook
m68k/atari: Do not use "/" in interrupt names
m68k: unistd - Comment out definitions for unimplemented syscalls
m68k: Really wire up sys_pselect6 and sys_ppoll
m68k: Merge mmu and non-mmu versions of sys_call_table
MAINTAINERS: Roman Zippel has been MIA for several years.
m68k: bitops - Never step beyond the end of the bitmap
m68k: bitops - offset == ((long)p - (long)vaddr) * 8
Diffstat (limited to 'lib/timerqueue.c')
0 files changed, 0 insertions, 0 deletions
