From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 27 Sep 2006 15:32:01 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: firefly_0821_release~33277
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ba21fe71725f94792330ebc3034ef2b35a36276f;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:
  [SPARC64]: Kill bogus check from bootmem_init().
  [SPARC64]: Update defconfig.
---

ba21fe71725f94792330ebc3034ef2b35a36276f