summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/systbl.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-05-23 16:42:19 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-05-23 16:42:19 -0700
commitee0736627d3347be0be2769fa7b26431f9726c9d (patch)
tree203e2204daaec4cf005463fdf2c7bf380d6eef36 /arch/powerpc/include/asm/systbl.h
parentcf9972a921470b0a2da7906104bcd540b20e33bf (diff)
parent0af48f42df15b97080b450d24219dd95db7b929a (diff)
downloadblackbird-op-linux-ee0736627d3347be0be2769fa7b26431f9726c9d.tar.gz
blackbird-op-linux-ee0736627d3347be0be2769fa7b26431f9726c9d.zip
Merge branch 'x86/urgent' into x86/setup
Resolved conflicts: arch/x86/boot/memory.c Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/powerpc/include/asm/systbl.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud