From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 22 Jun 2007 18:11:33 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfi... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3f2c6d0f4f0dafdc99af0df71edba57e7815cb13;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'master' of /linux/kernel/git/cooloney/blackfin-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
  Blackfin arch: add proper const volatile to addr argument to the read functions
  Blackfin arch: Add definition of dma_mapping_error
  Blackfin arch: move cond_syscall() behind __KERNEL__ like all other architectures
  Blackfin arch: match kernel startup messaage with new linker script
  Blackfin arch: add missing braces around array bfin serial init
  Blackfin arch: update printk to use KERN_EMERG and reformat crash output
  Blackfin arch: update ANOMALY handling
---

3f2c6d0f4f0dafdc99af0df71edba57e7815cb13