Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Mar 2010 21:41:00 +0000 (14:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Mar 2010 21:41:00 +0000 (14:41 -0700)
commitc45140a996b511bccdcbbdbea7e36f001826bdf2
tree8d6613880399d1a25598f7cb51834efbbda87ad9
parentde329820e920cd9cfbc2127cad26a37026260cce
parent9e8307ecaf9f8c8b5b3b22145021204c4e73114a
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Properly truncate pt_regs framepointer in perf callback.
  arch/sparc/kernel: Use set_cpus_allowed_ptr
  sparc: Fix use of uid16_t and gid16_t in asm/stat.h
arch/sparc/kernel/perf_event.c