projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a53b75b cd065a0)
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)
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


Trivial merge
John Crispins staging tree