diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 08:45:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 08:45:15 -0800 |
| commit | 1a2edea9aff48c31302e07100ddbaba358596cd7 (patch) | |
| tree | 7dc3c7f4b6bca030a8308537fbc7367f36c32003 /drivers/net/chelsio/sge.h | |
| parent | f589b86d4b6e067b720a253bdb40896857804037 (diff) | |
| parent | 17d57a9206b4de6ad082ac9f2d2346985abbd2aa (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: fix x86-32 early fixmap initialization.
x86: disable hpet legacy replacement for kdump
x86: disable hpet on shutdown
Diffstat (limited to 'drivers/net/chelsio/sge.h')
0 files changed, 0 insertions, 0 deletions