sh: Fix up some merge damage.
[linux-2.6] / arch / cris / configs /
2008-10-20  Paul MundtMerge branch 'master' of git://git./linux/kernel/git...
2008-10-17  Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-10-17  Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/staging-2.6
2008-10-17  Linus TorvaldsMerge branch 'hwmon-for-linus' of git://jdelvare.pck...
2008-10-17  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-17  Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.dk/linux...
2008-10-17  Linus TorvaldsMerge branch 'for-linus' of git://www.jni.nu/cris
2008-10-13  Adrian BunkCRIS: proper defconfig setup