tree fcea9657fcdca01b6fc3fac27c2e804aaac73c63
parent c63fdeee94f87aafc131e5594ab030638044cc29
parent f2a1585244681b92fd416d071a85de0db79235d2
author Linus Torvalds <torvalds@g5.osdl.org> 1145408575 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1145408575 -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:
  [SPARC64]: Fix dependencies of HUGETLB_PAGE_SIZE_64K