Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 30 Aug 2006 22:54:55 +0000 (15:54 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 30 Aug 2006 22:54:55 +0000 (15:54 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SUNLANCE]: Fix probing problem.
  [SPARC64]: Fix X server hangs due to large pages.


Trivial merge