]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77e2782 b9c54f9)
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)
* 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.


Trivial merge
Linux 2.6 source tree