diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-14 16:17:22 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-14 16:17:22 (GMT) |
| commit | 7c8284c3aa127ffe72a90a1bad52183ec9ad870a (patch) | |
| tree | db9d1c323be95161a6ca0b6d5f00ff367e6fae0d /drivers/net/tun.c | |
| parent | b719f43059903820c31edb30f4663a2818836e7f (diff) | |
| parent | b7c13f76fda994284521f6ef996119c25282bdeb (diff) | |
| download | linux-7c8284c3aa127ffe72a90a1bad52183ec9ad870a.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller:
1) Add finit_module syscall entry.
2) Remove stray __dev{init,exit} references, from Sam Ravnborg.
Fix up conflicts in the sparc PCI code due to whitespace differences in
the __dev{init,exit} removal (which also came in through Greg).
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: remove __devinit, __devexit annotations
sparc: Hook up finit_module syscall.
Diffstat (limited to 'drivers/net/tun.c')
0 files changed, 0 insertions, 0 deletions