diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-26 16:02:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-26 16:02:07 -0700 |
| commit | 1a041a23da7c77b53c71fe11b4f940388bee37b1 (patch) | |
| tree | 15be66d3768d609a477a99a0d59522133a831ee0 /include/net/tc_act/tc_mirred.h | |
| parent | ee13cbdec4381b5bdb24683b5e7fcc29084c355d (diff) | |
| parent | ff4878089e1eaeac79d57878ad4ea32910fb4037 (diff) | |
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: Do not try to disable hpet if it hasn't been initialized before
x86, i8259: Only register sysdev if we have a real 8259 PIC
Diffstat (limited to 'include/net/tc_act/tc_mirred.h')
0 files changed, 0 insertions, 0 deletions