diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-13 19:44:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-13 19:44:45 +0200 |
| commit | 31c4ab430a448cfb13fc88779d8a870c7af9f72b (patch) | |
| tree | aec64a8204ea8f89e9743cb16253de9deea4200d /fs/inotify_user.c | |
| parent | Revert "[CPUFREQ] powernow-k8: clarify number of cores." (diff) | |
| parent | [MIPS] Workaround for a sparse warning in include/asm-mips/mach-tx4927/ioremap.h (diff) | |
| download | linux-31c4ab430a448cfb13fc88779d8a870c7af9f72b.tar.xz linux-31c4ab430a448cfb13fc88779d8a870c7af9f72b.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] Workaround for a sparse warning in include/asm-mips/mach-tx4927/ioremap.h
[MIPS] Make show_code static and add __user tag
[MIPS] Workaround for a sparse warning in include/asm-mips/compat.h
[MIPS] Add some __user tags
[MIPS] math-emu minor cleanup
[MIPS] Kill CONFIG_TX4927BUG_WORKAROUND
[MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_FB_XPERT98
[MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1000_SRC_CLK
[MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1000_USE32K
[MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1XXX_PSC_SPI
[CHAR] Delete leftovers of old Alchemy UART driver
Diffstat (limited to 'fs/inotify_user.c')
0 files changed, 0 insertions, 0 deletions