Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 27 Sep 2006 15:32:01 +0000 (08:32 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 27 Sep 2006 15:32:01 +0000 (08:32 -0700)
commitba21fe71725f94792330ebc3034ef2b35a36276f
tree7e61050452b3a3fa6e17a8ae6147d0e4ecc611ca
parent1e2af92e089d4c845248844a3e7ee06ce889af46
parent715a0ecc29c850d2b2f76e1803d3f22cd5a0ac0d
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.