diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-19 01:15:40 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-19 01:15:40 +0200 |
commit | 20bf94e266969f91c623ed8b51da4109e3f57bcb (patch) | |
tree | 4aead8959e49802b454d9c650a86ee04ae94ad47 /net/Kconfig | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
parent | [SPARC]: Fix regression in sys_getdomainname() (diff) | |
download | linux-20bf94e266969f91c623ed8b51da4109e3f57bcb.tar.xz linux-20bf94e266969f91c623ed8b51da4109e3f57bcb.zip |
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/Kconfig')
0 files changed, 0 insertions, 0 deletions