tree 81a25939a99b9255777ca447cebc95b6385e61c3
parent e2197787efe54c0dcbdc4f6acb6dabb65f27f347
parent 1091ce6215a1cab60c3a4601a569cb727ca8637a
author Linus Torvalds <torvalds@linux-foundation.org> 1264474645 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1264474645 -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: Fix IRQ ->set_affinity() methods.
  sparc: cpumask_of_node() should handle -1 as a node
  sparc64: Update defconfig.
  sparc: Add missing SW perf fault events.
  sparc64: Fully support both performance counters.
  sparc64: Add perf callchain support.
  sparc: convert to arch_gettimeoffset()
  sparc: leds_resource.end assigned to itself in clock_board_probe()
  sparc32: Fix page_to_phys().
  sparc: Simplify param.h by simply including <asm-generic/param.h>
  sparc32: Update defconfig.
  SPARC: use helpers for rlimits
  sparc: copy_from_user() should not return -EFAULT