diff options
author | Linus Torvalds | 2007-08-07 02:52:56 +0200 |
---|---|---|
committer | Linus Torvalds | 2007-08-07 02:52:56 +0200 |
commit | 9e865f58da5ff0a9c19669a49ac984117711757a (patch) | |
tree | 21f64e79ac21d794df5a407f10a9326e26d38f17 /drivers/kvm/x86_emulate.c | |
parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sp... (diff) | |
parent | [NETFILTER]: Add xt_statistic.h to the header list for usermode programs (diff) | |
download | kernel-qcow2-linux-9e865f58da5ff0a9c19669a49ac984117711757a.tar.gz kernel-qcow2-linux-9e865f58da5ff0a9c19669a49ac984117711757a.tar.xz kernel-qcow2-linux-9e865f58da5ff0a9c19669a49ac984117711757a.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NETFILTER]: Add xt_statistic.h to the header list for usermode programs
[BNX2]: Fix suspend/resume problem.
[TG3]: Fix suspend/resume problem.
Diffstat (limited to 'drivers/kvm/x86_emulate.c')
0 files changed, 0 insertions, 0 deletions