From: Linus Torvalds Date: Tue, 23 Oct 2007 02:29:05 +0000 (-0700) Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney... X-Git-Tag: v2.6.24-rc1~58 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6d435365dd49ac5f7fe6f0e757e942875b1d1550;p=linux-2.6-omap-h63xx.git Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: Blackfin arch: use KBUILD_CFLAGS and KBUILD_AFLAGS in Makefile Blackfin arch: Javier Herrer writes: fix building when icache and dcache is disabled --- 6d435365dd49ac5f7fe6f0e757e942875b1d1550