Merge branch 'irq/numa' into x86/mce3

Browse source

Merge reason: arch/x86/kernel/irqinit_{32,64}.c unified in irq/numa
and modified in x86/mce3; this merge resolves the conflict.

Conflicts:
	arch/x86/kernel/irqinit.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

...

This commit is contained in:

H. Peter Anvin 2009-06-01 15:13:02 -07:00

parent 38736072d4 ee4c24a5c9

commit 48b1fddbb1

211 changed files with 2527 additions and 1900 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

6

Documentation/hwmon/sysfs-interface

View file

103

Documentation/input/multi-touch-protocol.txt

View file

3

Documentation/kernel-parameters.txt

View file

5

Documentation/sound/alsa/Procfile.txt

View file