From: Linus Torvalds Date: Wed, 30 Aug 2006 22:54:55 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=df31405a9a240e8ea882953ea90736ff57b47643;p=linux-beck.git 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. --- df31405a9a240e8ea882953ea90736ff57b47643