diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-22 17:04:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-22 17:04:58 -0700 |
| commit | 130eb4653550ff9c73e09858464446cc9d59ff7b (patch) | |
| tree | 9e2fbe1a3ef2d6dc99f2507a90403a307cb1e487 /include/net/ipcomp.h | |
| parent | f16278c679aa72e28288435b313ba2d4494d6be5 (diff) | |
| parent | 9e9630481ee8ef33f1cce71ce3636169fa37cd49 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: revert: reserve dma32 early for gart
Diffstat (limited to 'include/net/ipcomp.h')
0 files changed, 0 insertions, 0 deletions