Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Mar 2010 16:24:47 +0000 (08:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Mar 2010 16:24:47 +0000 (08:24 -0800)
commit6895210e89df20520916c94a4dc148a43229053e
tree60b137cccd4a57bb98bbfed55a42859e4b60c8db
parent4c10c937cc2eb197db565392db91d429eec71176
parent8a4fd1e4922413cfdfa6c51a59efb720d904a5eb
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Make prom entry spinlock NMI safe.
  sparc64: Kill off old sys_perfctr system call and state.
  sparc: Update defconfigs.
  sparc: Provide io{read,write}{16,32}be().
arch/sparc/kernel/rtrap_64.S