Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
commit329b10bb0feacb7fb9a41389313ff0a51ae56f2a
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 27 Mar 2006 16:47:54 +0000 (27 08:47 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 27 Mar 2006 16:47:54 +0000 (27 08:47 -0800)
treea5b2d136589c90e36f87da7bab312109314c21b3
parentfdccffc6b711d1bfcd1e1b569537686dcad423e2
parent7bebd83dbf096d0bf4b4bfbaf5d8844a05f5eafc
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix off-by-1 error in TSB grow check.