4a15bb38cd454c7f80db2b1f3
parent 5a0276b7ae1fcd90cea07f65452aebbd1b0743c5
parent b434e71933aa0519ee042c01419db76b7dcc058e
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1186673245 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1186673245 -0700

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.
ÖªóÇ•'x