tree 0c7b2de254ebd00999b3fd81f0941ea32eb9e14e
parent 380dc2008824473450b0c6596dcd429965a4a9da
parent 38f7f8f05e8239e9871f7e1c4b0a842080e85315
author Linus Torvalds <torvalds@linux-foundation.org> 1314650262 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1314650262 -0700

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc32,sun4d: Change IPI IRQ level to prevent collision between IPI and timer interrupt
  sparc: Remove another reference to nfsservctl