diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-04 12:55:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-04 12:55:56 -0800 |
| commit | 05a8057bb38bc803682f3e0af305c258b4566285 (patch) | |
| tree | 38c67c8739724bc398866d068336c8034f82526f /include/linux/magic.h | |
| parent | 8be7ed14f4f45e0cd19a70120a1526e1121af4b0 (diff) | |
| parent | f9af1d9deaaffe6803dec693748498886915d766 (diff) | |
| download | linux-05a8057bb38bc803682f3e0af305c258b4566285.tar.gz linux-05a8057bb38bc803682f3e0af305c258b4566285.tar.bz2 linux-05a8057bb38bc803682f3e0af305c258b4566285.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SOUND] Sparc CS4231: Use 64 for period_bytes_min
[SOUND] Sparc CS4231: Fix IRQ return value and initialization.
Diffstat (limited to 'include/linux/magic.h')
0 files changed, 0 insertions, 0 deletions