diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-27 14:24:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-27 14:24:49 -0700 |
commit | a9aa0e24f7ed5acf2e0e1799fb28daf928293ba1 (patch) | |
tree | 38782b91d531c8d98b81372a7c964fa2c924b90f /fs/9p/error.h | |
parent | 7c1c3eb855b5311118bed3b51c79d652d40148ec (diff) | |
parent | ee1cca1b0661fa33fd99f2d8ec7e2749432f9b1d (diff) |
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] Fix branch emulation for floating-point exceptions.
[MIPS] Cleanup inode->r_dev usage.
[MIPS] Update MIPS defconfigs.
[MIPS] Get rid of CONFIG_ADVANCED.
[MIPS] Kconfig: Clarify description of CROSSCOMPILE.
[MIPS] 24K LV: Add core card id.
[MIPS] Sparse: fix sparse for 64-bit kernels.
[MIPS] Use __ffs() instead of ffs() in ip32_irq0().
[MIPS] Fix bitops for MIPS32/MIPS64 CPUs.
[MIPS] Fix ip27 build.
[MIPS] Oprofile: fix sparse warning.
[MIPS] Fix oprofile module unloading
Diffstat (limited to 'fs/9p/error.h')
0 files changed, 0 insertions, 0 deletions