projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9232d58 2cafe97)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.osdl.org>
Thu, 7 Dec 2006 00:17:37 +0000 (16:17 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Thu, 7 Dec 2006 00:17:37 +0000 (16:17 -0800)
commit3f5e573a08a369bd10d2f89b63a2d68843f64a6b
tree069a5636974c783adc6251f71d71cd2b0aa49cc9tree | snapshot
parent9232d5876e83921414de65d82edd1098258f6680commit | diff
parent2cafe978462bc4016392aa330bf501a674679a86commit | diff
Merge branch 'upstream' of git://ftp.linux-mips.org/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
John Crispins staging tree