Merge tag 'cris-correction-for-3.14' of git://jni.nu/cris
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jan 2014 17:01:14 +0000 (09:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jan 2014 17:01:14 +0000 (09:01 -0800)
commitbe86497152220677e3e5cb326519e19d727f8674
tree5611a36a633c7d2e437b31d67b27776dab187818
parenta53b75b37aacd85a2f005e80faf44a7c2e3aa0bc
parentcd065a010a97e3c330d1ded9af551664c9689b19
Merge tag 'cris-correction-for-3.14' of git://jni.nu/cris

Pull cris fix from Jesper Nilsson:
 "One include too much was removed"

* tag 'cris-correction-for-3.14' of git://jni.nu/cris:
  CRISv10: Readd missing header