From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Thu, 7 Dec 2006 00:17:37 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.20-rc1~34^2~20^2~23
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3f5e573a08a369bd10d2f89b63a2d68843f64a6b;p=linux-2.6-omap-h63xx.git

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
---

3f5e573a08a369bd10d2f89b63a2d68843f64a6b