diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-22 11:11:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-22 11:11:33 -0700 |
| commit | 3f2c6d0f4f0dafdc99af0df71edba57e7815cb13 (patch) | |
| tree | 757a03a92ee24cdd21b26c2f478b10eb607172ab /arch/cris | |
| parent | 4beb2584be3cf1d4fc7a222b0f747735da8e3c91 (diff) | |
| parent | 216e39db112da4d25a52aeb956e7da70fdd0d94c (diff) | |
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: 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
Diffstat (limited to 'arch/cris')
0 files changed, 0 insertions, 0 deletions