Re: [PATCH] powerpc: remove rejected merge file from arch/powerpc/kernel in linux-next

On Thu, 2012-07-12 at 00:05 -0700, Gerard Snitselaar wrote: > Commit 9778b696 (powerpc: Use CURRENT_THREAD_INFO instead of open > coded assembly) got a rejected merge file iommu.c.rej committed with > it. Oops, that's me having too much coffee & using git citool ... I'll get rid of it, thanks. Ch

[PATCH] powerpc: remove rejected merge file from arch/powerpc/kernel in linux-next

Commit 9778b696 (powerpc: Use CURRENT_THREAD_INFO instead of open coded assembly) got a rejected merge file iommu.c.rej committed with it. Signed-off-by: Gerard Snitselaar --- arch/powerpc/kernel/iommu.c.rej | 22 -- 1 file changed, 22 deletions(-) delete mode 100644 arch/po