tree 55894647a47c69d563b7b135484c05f6c36a62d6
parent c1fa238762ad2518ab6003983c16508470be6d81
parent 7718457dc8fd98a9f61a5e42653161bac3904a65
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1183435514 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1183435514 -0700

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