diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-19 12:38:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-19 12:38:55 -0800 |
| commit | dd59f6c76b265ed2ff18b497d6105a9511b1feb1 (patch) | |
| tree | 20b2dada6ef16126c8e4c372d65790cc5b757b86 /arch/sh/include/cpu-sh4/cpu/dma-sh4a.h | |
| parent | 70e66a5079b2b33f142303d31581cf03f7af98fe (diff) | |
| parent | acadbfb90a54673d6c8b05aa4e93218433890411 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: Convert BUG() to use unreachable()
alpha: Add minimal support for software performance events
alpha: Wire up missing/new syscalls
Diffstat (limited to 'arch/sh/include/cpu-sh4/cpu/dma-sh4a.h')
0 files changed, 0 insertions, 0 deletions