diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-26 12:04:17 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-26 12:04:17 +1100 |
commit | b0e3fcc5933c0109ccc8599a42c1e9925dac9c1d (patch) | |
tree | 9896f1500ca2a4d5d2d68461878ff2c61f15ea87 /include/asm-m68k | |
parent | f05bd353fab6b9076072ddaca2d6e00940cb6d22 (diff) | |
parent | fd07eb45ec0293019ec94503054b33141d803427 (diff) |
Merge commit 'tip-core/auto-core-next'
Conflicts:
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'include/asm-m68k')
0 files changed, 0 insertions, 0 deletions