tree 7ff8833745d2f268f897f6fa4a27263b4a572245
parent de18836e447c2dc30120c0919b8db8ddc0401cc4
parent 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c
author Ingo Molnar <mingo@elte.hu> 1238974882 +0200
committer Ingo Molnar <mingo@elte.hu> 1238974882 +0200

Merge branch 'linus' into irq/threaded

Conflicts:
	include/linux/irq.h
	kernel/irq/handle.c