diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-18 16:15:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-18 16:15:40 -0700 |
| commit | 20bf94e266969f91c623ed8b51da4109e3f57bcb (patch) | |
| tree | 4aead8959e49802b454d9c650a86ee04ae94ad47 /net/ipv6/Makefile | |
| parent | 77e2782f9b683893c9341e9cf05c88b0caac7382 (diff) | |
| parent | b9c54f91a48146778fe91423d4d467a0ee8c719b (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Fix regression in sys_getdomainname()
[OPENPROMIO]: Handle current_node being NULL correctly.
Diffstat (limited to 'net/ipv6/Makefile')
0 files changed, 0 insertions, 0 deletions