diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 13:39:00 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 13:39:00 +1000 |
commit | f2603c77e8cd7777742da9eb8feea06fbd85c267 (patch) | |
tree | a2ecf7df8e2aed5db5fd58987390bb7ca65715d5 /include/linux/device.h | |
parent | 9546e899e803ea8e738911b36bfcfe020031eefe (diff) | |
parent | 0536899878853e1963e516c322d4578dc5b4fcd0 (diff) |
Merge commit 'x86/auto-x86-next'
Conflicts:
arch/x86/kernel/io_apic_32.c
arch/x86/kernel/nmi_32.c
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
Diffstat (limited to 'include/linux/device.h')
0 files changed, 0 insertions, 0 deletions