diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-14 11:30:42 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-14 11:30:42 +1000 |
| commit | 7b5aa5429782b422ee709de16e63aac619cd8fc4 (patch) | |
| tree | 24a6e863a47b1ee99c20785e628dfbd209dd307d /arch/x86/kernel/bootflag.c | |
| parent | 9c3e63b36b736a027579ef5d34a68d4954efa940 (diff) | |
| parent | 05fbdf6814cccf2bd32fbed12e9f44481956af75 (diff) | |
Merge commit 'x86/auto-x86-next'
Conflicts:
arch/x86/kernel/Makefile
arch/x86/kernel/entry_32.S
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
arch/x86/kernel/traps_32.c
arch/x86/kernel/traps_64.c
arch/x86/lib/Makefile
drivers/base/topology.c
include/asm-x86/irqflags.h
Diffstat (limited to 'arch/x86/kernel/bootflag.c')
0 files changed, 0 insertions, 0 deletions