Merge branch 'cris_move' of git://www.jni.nu/cris
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Nov 2008 16:51:51 +0000 (09:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Nov 2008 16:51:51 +0000 (09:51 -0700)
* 'cris_move' of git://www.jni.nu/cris:
  [CRIS] Move header files from include to arch/cris/include.
  [CRISv32] Remove warning in io.h


Trivial merge