From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Aug 2011 20:37:42 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: next-20110830~106
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2cd6c7f7f1e3a116506bb3326f0d23a6b801638a;p=karo-tx-linux.git

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
---

2cd6c7f7f1e3a116506bb3326f0d23a6b801638a