diff options
author | 2009-04-20 18:08:07 +0200 | |
---|---|---|
committer | 2009-04-20 18:08:12 +0200 | |
commit | 62d170290979e0bb805d969cca4ea852bdd45260 (patch) | |
tree | 837372297501a2d144358b44e7db3f88c5612aa2 /include/linux/interrupt.h | |
parent | docs, x86: add nox2apic back to kernel-parameters.txt (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio (diff) | |
download | wireguard-linux-62d170290979e0bb805d969cca4ea852bdd45260.tar.xz wireguard-linux-62d170290979e0bb805d969cca4ea852bdd45260.zip |
Merge branch 'linus' into x86/urgent
Merge reason: We need the x86/uv updates from upstream, to queue up
dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/interrupt.h')
0 files changed, 0 insertions, 0 deletions