]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 19 Apr 2006 01:02:55 +0000 (18:02 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 19 Apr 2006 01:02:55 +0000 (18:02 -0700)
commitba9bd0f6210a84fe7625570f3d5f5902e743017d
treefcea9657fcdca01b6fc3fac27c2e804aaac73c63
parentce6db8d27ca4da525cc3f0f85322dcd818ce4416
parent73d6c142dde228f854ff3b2122a313c0fe128de8
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