tree 554a4c799888e8934d2bf222bd0fcae2a9146bb4
parent ed09441dacc2a2d6c170aa3b1f79a041291a813f
parent 8f808417fe211648c0816e28947cdc74eb1e1032
author Linus Torvalds <torvalds@linux-foundation.org> 1224259788 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1224259788 -0700

Merge branch 'for-linus' of git://www.jni.nu/cris

* 'for-linus' of git://www.jni.nu/cris:
  CRIS: proper defconfig setup
  [CRIS] Rename boot-linkscripts and fix the path to them.