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)
commit0242909a6135e10a28822c64f9ad50fdad52757c
treec5f9c8abe95a65433e6ac356871f2379c02488fe
parent0a6d2fac615972142715d736289abeeb7382e81d
parent556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3
Merge branch 'cris_move' of git://www.jni.nu/cris

* 'cris_move' of git://www.jni.nu/cris:
  [CRIS] Move header files from include to arch/cris/include.
  [CRISv32] Remove warning in io.h