Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 18 Sep 2006 23:15:40 +0000 (16:15 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 18 Sep 2006 23:15:40 +0000 (16:15 -0700)
commit20bf94e266969f91c623ed8b51da4109e3f57bcb
tree4aead8959e49802b454d9c650a86ee04ae94ad47
parent77e2782f9b683893c9341e9cf05c88b0caac7382
parentb9c54f91a48146778fe91423d4d467a0ee8c719b
Merge /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.