diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-18 21:02:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-18 21:02:55 -0400 |
| commit | a196e7880905313773be97dbca5aa7b0a0aed71c (patch) | |
| tree | fcea9657fcdca01b6fc3fac27c2e804aaac73c63 /net/dccp/timer.c | |
| parent | c63fdeee94f87aafc131e5594ab030638044cc29 (diff) | |
| parent | f2a1585244681b92fd416d071a85de0db79235d2 (diff) | |
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
Diffstat (limited to 'net/dccp/timer.c')
0 files changed, 0 insertions, 0 deletions