Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[pandora-kernel.git] / arch / m32r / include / asm / elf.h

diff --cc arch/m32r/include/asm/elf.h
Simple merge