summaryrefslogtreecommitdiff
path: root/arch/m68k
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-10 14:43:37 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-10 14:43:37 -0700
commit897ee77bfba12b83752027427a41009961458ee6 (patch)
tree2caf21fd61ab29d5e5ac37e45ff70b55ceeff9c9 /arch/m68k
parentf3f94ce5dba6e134cf0958dd3a42ab28a028fc83 (diff)
parent43863074659b71345b0047c2cf2ff8d8f7a4b4a1 (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] 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 'arch/m68k')
0 files changed, 0 insertions, 0 deletions