Merge branch 'linus' into irq/threaded

Browse source

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

...

This commit is contained in:

Ingo Molnar 2009-04-06 01:41:22 +02:00

parent de18836e44 0221c81b1b

commit 9efe21cb82

7478 changed files with 863580 additions and 313404 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

14

include/linux/interrupt.h

View file