From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Oct 2008 16:09:48 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://www.jni.nu/cris
X-Git-Tag: v2.6.28-rc1~262
X-Git-Url: https://git.kernel.dk/?p=linux-2.6-block.git;a=commitdiff_plain;h=b73b636e8987f8728c6c700377615757691b9a55

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.
---

b73b636e8987f8728c6c700377615757691b9a55