From: Linus Torvalds Date: Tue, 3 Jul 2007 04:05:14 +0000 (-0700) Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfi... X-Git-Tag: v2.6.22~45 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ca9c5ffd9d12e136f72fa52840cda83485d586cd;p=~shefty%2Frdma-dev.git Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: Blackfin arch: remove zero-sized include/asm-blackfin/macros.h Blackfin arch: update board defconfig files Blackfin arch: Fix up remaining printks with proper log levels Blackfin arch: Add proper -mcpu option according to the cpu and silicon revision configuration --- ca9c5ffd9d12e136f72fa52840cda83485d586cd