From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 18 Sep 2006 23:15:40 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: firefly_0821_release~33687
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=20bf94e266969f91c623ed8b51da4109e3f57bcb;p=firefly-linux-kernel-4.4.55.git

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.
---

20bf94e266969f91c623ed8b51da4109e3f57bcb