diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 23:47:53 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 23:47:53 +0200 |
| commit | af7b83f9324a77ef9a9080044bf0461f444ca651 (patch) | |
| tree | 09dc85a0d4842d300bfac5e33d2bbf9ca87acad7 /fs | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| parent | [MIPS] Fix aliasing bug in copy_user_highpage. (diff) | |
| download | linux-af7b83f9324a77ef9a9080044bf0461f444ca651.tar.xz linux-af7b83f9324a77ef9a9080044bf0461f444ca651.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] Fix aliasing bug in copy_user_highpage.
[MIPS] IP22: fix wrong argument order
[MIPS] IP22: Fix wrong check for second HPC
[MIPS] Ocelot: remove remaining bits
[MIPS] TLB: Fix instruction bitmasks
[MIPS] R10000: Fix wrong test in dma-default.c
[MIPS] Provide empty irq_enable_hazard definition for legacy and R1 cores.
[MIPS] Sibyte: Remove broken dependency on EXPERIMENTAL from SIBYTE_SB1xxx_SOC.
[MIPS] Kconfig: whitespace cleanup.
[MIPS] PCI: Set need_domain_info if controller domain index is non-zero.
[MIPS] BCM1480: Fix computation of interrupt mask address register.
[MIPS] i8259: Add disable method.
[MIPS] tty: add the new ioctls and definitions.
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions