8db
parent 4c10c937cc2eb197db565392db91d429eec71176
parent 8a4fd1e4922413cfdfa6c51a59efb720d904a5eb
author Linus Torvalds <torvalds@linux-foundation.org> 1267719887 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1267719887 -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: 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().
QÐÄÒŸ