diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-13 19:14:25 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-13 19:14:25 +0200 |
| commit | ffb035591f2736921d5dadcf8597bc1da1ba71e5 (patch) | |
| tree | 1751005ff69b6b1e55325c45c65c9e83e2a5adf0 /include/asm-alpha/resource.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| parent | [MIPS] SMP: Fix use of cpumasks. (diff) | |
| download | linux-ffb035591f2736921d5dadcf8597bc1da1ba71e5.tar.xz linux-ffb035591f2736921d5dadcf8597bc1da1ba71e5.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] SMP: Fix use of cpumasks.
[MIPS] Revert "[MIPS] tlbex.c: Cleanup __init usage."
[MIPS] CFE: Add missing parenthesis.
Diffstat (limited to 'include/asm-alpha/resource.h')
0 files changed, 0 insertions, 0 deletions