Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfi...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 3 Jul 2007 04:05:14 +0000 (21:05 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 3 Jul 2007 04:05:14 +0000 (21:05 -0700)
* '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


Trivial merge