Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Aug 2011 05:49:34 +0000 (22:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Aug 2011 05:49:34 +0000 (22:49 -0700)
commit01b883358ba4b616d9d161b43af4bb5ee8124fe8
tree72f3efdd8da22c75d68d2f48d4e47ae03d267bd1
parent2c4ac99f983f1341b5962a16b5e8de6049bf10b5
parent4a0342ca8e8150bd47e7118a76e300692a1b6b7b
Merge git://git./linux/kernel/git/davem/sparc

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: fix array bounds error setting up PCIC NMI trap