diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-13 10:44:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-13 10:44:45 -0700 |
| commit | 31c4ab430a448cfb13fc88779d8a870c7af9f72b (patch) | |
| tree | aec64a8204ea8f89e9743cb16253de9deea4200d /kernel | |
| parent | 8b69ad0e690eb5f38c23087247a12e5fde1baeff (diff) | |
| parent | f24ae12b3eeb1b956b752d4d5907e311cfa95a1a (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] 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 'kernel')
0 files changed, 0 insertions, 0 deletions