Merge branch 'for-linus' of git://www.jni.nu/cris
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Oct 2008 16:09:48 +0000 (09:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Oct 2008 16:09:48 +0000 (09:09 -0700)
commitb73b636e8987f8728c6c700377615757691b9a55
tree554a4c799888e8934d2bf222bd0fcae2a9146bb4
parented09441dacc2a2d6c170aa3b1f79a041291a813f
parent8f808417fe211648c0816e28947cdc74eb1e1032
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.