| commit | a196e7880905313773be97dbca5aa7b0a0aed71c | |
| author | Linus Torvalds <torvalds@g5.osdl.org> | |
| Wed, 19 Apr 2006 01:02:55 +0000 (18 18:02 -0700) | ||
| committer | Linus Torvalds <torvalds@g5.osdl.org> | |
| Wed, 19 Apr 2006 01:02:55 +0000 (18 18:02 -0700) | ||
| tree | fcea9657fcdca01b6fc3fac27c2e804aaac73c63 | treesnapshot (tar.gz zip) |
| parent | c63fdeee94f87aafc131e5594ab030638044cc29 | commitdiff |
| parent | f2a1585244681b92fd416d071a85de0db79235d2 | commitdiff |
Merge /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
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix dependencies of HUGETLB_PAGE_SIZE_64K