Merge 'akpm' patch series
[pandora-kernel.git] / arch / xtensa / kernel / ptrace.c
Simple merge