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)
commitdf31405a9a240e8ea882953ea90736ff57b47643
tree082b1c061f976a4f9031f7e44b77d50a959a28de
parent7c30b0653f1bcaf04f8abf24cad5c1e642a3da47
parent404dda854b8bb04df72405d5088fa3e6100aef36
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

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