diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-19 19:58:13 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-19 19:58:13 +0200 |
commit | 9d914b3ef38d996aa6b369267fd2975e7efa92d6 (patch) | |
tree | 1db3591bd44c2a20e82f16f84fbc07a714ec36dc /net/caif/cfdgml.c | |
parent | Merge branch 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | x86, gart: Make sure GART does not map physmem above 1TB (diff) | |
download | linux-9d914b3ef38d996aa6b369267fd2975e7efa92d6.tar.xz linux-9d914b3ef38d996aa6b369267fd2975e7efa92d6.zip |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, gart: Make sure GART does not map physmem above 1TB
x86, gart: Set DISTLBWALKPRB bit always
x86, gart: Convert spaces to tabs in enable_gart_translation
Diffstat (limited to 'net/caif/cfdgml.c')
0 files changed, 0 insertions, 0 deletions