diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 12:29:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 12:29:55 -0700 |
| commit | 5dae61b80564a5583ff4b56e357bdbc733fddb76 (patch) | |
| tree | 75d9a103f5fed1d747f8aa2bf5d8d8b0c42e6185 /drivers/net/s2io.h | |
| parent | 2e561c7b7e705b619122e5386d6f99f28f2b6e5a (diff) | |
| parent | 2664ef44cf5053d2b7dff01cecac70bc601a5f68 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Wrap SMP IPIs with irq_enter()/irq_exit().
[SPARC64]: Fix args to 64-bit sys_semctl() via sys_ipc().
Diffstat (limited to 'drivers/net/s2io.h')
0 files changed, 0 insertions, 0 deletions