From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 9 Aug 2007 15:27:25 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.23-rc3~71
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e7bc15a9ad07269c48732e9a9874e5938b4700ee;p=~shefty%2Frdma-dev.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix memory leak when cpu hotplugging.
  [SPARC64]: Do not assume sun4v chips have load-twin/store-init support.
  [SPARC64]: Fix hard-coding of cpu type output in /proc/cpuinfo on sun4v.
  [SPARC]: Centralize find_in_proplist() instead of duplicating N times.
---

e7bc15a9ad07269c48732e9a9874e5938b4700ee