From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 19 Apr 2006 01:02:55 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.17-rc2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a196e7880905313773be97dbca5aa7b0a0aed71c;p=linux-2.6-omap-h63xx.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:
  [SPARC64]: Fix dependencies of HUGETLB_PAGE_SIZE_64K
---

a196e7880905313773be97dbca5aa7b0a0aed71c