cb
parent 25431e900dc47abb312c9ae8599e8c8ae038eb5a
parent 9b02605826903203d5301049c1f52e722584785c
author Linus Torvalds <torvalds@linux-foundation.org> 1233762840 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1233762840 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Kill bogus TPC/address truncation during 32-bit faults.
  sparc: fixup for sparseirq changes
  sparc64: Validate kernel generated fault addresses on sparc64.
  sparc64: On non-Niagara, need to touch NMI watchdog in NOHZ mode.
  sparc64: Implement NMI watchdog on capable cpus.
  sparc: Probe PMU type and record in sparc_pmu_type.
  sparc64: Move generic PCR support code to seperate file.
`h@ž:x