tree 5bcab227cc2008df6cfb17533be0a69ffd21e981
parent 605a494e4df0b2dabdebcdfee99536b0f6a22adc
parent 405849610fd96b4f34cd1875c4c033228fea6c0f
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1187454868 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1187454868 -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:
  [MATH-EMU]: Fix underflow exception reporting.
  [SPARC64]: Create a HWCAP_SPARC_N2 and report it to userspace on Niagara-2.
  [SPARC64]: SMP trampoline needs to avoid %tick_cmpr on sun4v too.
  [SPARC64]: Do not touch %tick_cmpr on sun4v cpus.
  [SPARC64]: Niagara-2 optimized copies.
  [SPARC64]: Allow userspace to get at the machine description.
  [SPARC32]: Remove superfluous 'kernel_end' alignment on sun4c.
  [SPARC32]: Fix bogus ramdisk image location check.
  [SPARC32]: Remove iommu from struct sbus_bus and use archdata like sparc64.