Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
  xtensa: Update platform files to reflect new location of the header files.
  xtensa: switch to packed struct unaligned access implementation
  xtensa: Add xt2000 support files.
  xtensa: move headers files to arch/xtensa/include
  xtensa: use the new byteorder headers

diff --cc arch/xtensa/include/asm/atomic.h
Simple merge

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

diff --cc arch/xtensa/platforms/iss/network.c
Simple merge