tree 082b1c061f976a4f9031f7e44b77d50a959a28de
parent 7c30b0653f1bcaf04f8abf24cad5c1e642a3da47
parent 404dda854b8bb04df72405d5088fa3e6100aef36
author Linus Torvalds <torvalds@g5.osdl.org> 1156978495 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1156978495 -0700

Merge master.kernel.org:/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.