tree 069a5636974c783adc6251f71d71cd2b0aa49cc9
parent 9232d5876e83921414de65d82edd1098258f6680
parent 2cafe978462bc4016392aa330bf501a674679a86
author Linus Torvalds <torvalds@woody.osdl.org> 1165450657 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1165450657 -0800

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] Import updates from i386's i8259.c
  [MIPS] *-berr: Header inclusions for DEC bus error handlers
  [MIPS] Compile __do_IRQ() when really needed
  [MIPS] genirq: use name instead of typename
  [MIPS] Do not use handle_level_irq for ioasic_dma_irq_type.
  [MIPS] pte_offset(dir,addr): parenthesis fix