OpenRISC: Headers

Signed-off-by: Jonas Bonn <jonas@southpole.se>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/openrisc/include/asm/asm-offsets.h
Simple merge

diff --cc arch/openrisc/include/asm/bitops.h
Simple merge

diff --cc arch/openrisc/include/asm/bitops/__ffs.h
Simple merge

diff --cc arch/openrisc/include/asm/bitops/__fls.h
Simple merge

diff --cc arch/openrisc/include/asm/bitops/ffs.h
Simple merge

diff --cc arch/openrisc/include/asm/bitops/fls.h
Simple merge

diff --cc arch/openrisc/include/asm/byteorder.h
Simple merge

diff --cc arch/openrisc/include/asm/cpuinfo.h
Simple merge

diff --cc arch/openrisc/include/asm/delay.h
Simple merge

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

diff --cc arch/openrisc/include/asm/io.h
Simple merge

diff --cc arch/openrisc/include/asm/linkage.h
Simple merge

diff --cc arch/openrisc/include/asm/mutex.h
Simple merge

diff --cc arch/openrisc/include/asm/param.h
Simple merge

diff --cc arch/openrisc/include/asm/processor.h
Simple merge

diff --cc arch/openrisc/include/asm/serial.h
Simple merge

diff --cc arch/openrisc/include/asm/spinlock.h
Simple merge

diff --cc arch/openrisc/include/asm/spr.h
Simple merge

diff --cc arch/openrisc/include/asm/spr_defs.h
Simple merge

diff --cc arch/openrisc/include/asm/system.h
Simple merge

diff --cc arch/openrisc/include/asm/unaligned.h
Simple merge

diff --cc arch/openrisc/kernel/vmlinux.h
Simple merge