diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-15 17:51:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-15 17:51:39 -0500 |
| commit | 9fc819172aa565c7be51f758b7e85301c9df7c70 (patch) | |
| tree | 55bddc16c148257494ce912728422b32d5f96fbb /drivers/input/joystick/gf2k.c | |
| parent | 933a42b1842d0b7bc7e4e16f2f5f1099e72870d4 (diff) | |
| parent | 44c36aed43b57ea12140957bebe76d711fbed653 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: cpumask_of_node() should handle -1 as a node
alpha: add myself as a maintainer, and drop mention of 2.4
Diffstat (limited to 'drivers/input/joystick/gf2k.c')
0 files changed, 0 insertions, 0 deletions