diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-29 12:53:39 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-29 12:53:39 +1100 |
commit | 3d74ad5cbcad2434b3b1530f633082b2df410d83 (patch) | |
tree | c7c2f1b4ebdf7875a5632c8c0796477b79020467 /arch/sh/include/asm/topology.h | |
parent | dd1bc42e75d4d615030ee4eef0733024f8b69f06 (diff) | |
parent | cfc592e9a129e92e31f82d0b0c992ca206d77f45 (diff) |
Merge commit 'tip-core/auto-core-next'
Conflicts:
include/linux/hardirq.h
Diffstat (limited to 'arch/sh/include/asm/topology.h')
0 files changed, 0 insertions, 0 deletions