From: Linus Torvalds 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: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b73b636e8987f8728c6c700377615757691b9a55;p=linux-2.6-omap-h63xx.git 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