tree b7614ffeca67d328ec70d9d886c4ae63ce225f44
parent 963c6527e0a0e285736ad482b8142d098f9c2288
author Thomas Gleixner <tglx@linutronix.de> 1186933594 +0000
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1186941945 -0700

genirq: cleanup mismerge artifact

Commit 5a43a066b11ac2fe84cf67307f20b83bea390f83: "genirq: Allow fasteoi
handler to retrigger disabled interrupts" was erroneously applied to
handle_level_irq().  This added the irq retrigger / resend functionality
to the level irq handler.

Revert the offending bits.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>