aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/mpc6xx.h
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2010-10-22 11:40:48 -0400
committerAndi Kleen <ak@linux.intel.com>2010-10-22 11:40:48 -0400
commit46e387bbd82d438b9131e237e6e2cb55a825da49 (patch)
tree414948afd6b4d63c6ea8cc79ce022128bc1bf2eb /arch/powerpc/include/asm/mpc6xx.h
parente9d08567ef72a2d0fb9b14dded386352d3136442 (diff)
parent3ef8fd7f720fc4f462fcdcae2fcde6f1c0536bfe (diff)
Merge branch 'hwpoison-hugepages' into hwpoison
Conflicts: mm/memory-failure.c
Diffstat (limited to 'arch/powerpc/include/asm/mpc6xx.h')
0 files changed, 0 insertions, 0 deletions