| commit | 2cd6c7f7f1e3a116506bb3326f0d23a6b801638a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 29 13:37:42 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 29 13:37:42 2011 -0700 |
| tree | 0c7b2de254ebd00999b3fd81f0941ea32eb9e14e | |
| parent | 380dc2008824473450b0c6596dcd429965a4a9da [diff] | |
| parent | 38f7f8f05e8239e9871f7e1c4b0a842080e85315 [diff] |
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