Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse source

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: ce4100: Configure IOAPIC pins for USB and SATA to level type
  x86: devicetree: Configure IOAPIC pin only once
  x86, setup: When probing memory with e801, use ax/bx as a pair

...

This commit is contained in:

Linus Torvalds 2011-04-29 15:07:19 -07:00

parent 592311c91d 1ff42c32c7

commit a6ab948e65

5 changed files with 11 additions and 11 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

2

arch/x86/boot/memory.c

View file

2

arch/x86/include/asm/io_apic.h

View file

10

arch/x86/kernel/apic/io_apic.c

View file

2

arch/x86/kernel/devicetree.c

View file

6

arch/x86/platform/ce4100/falconfalls.dts

View file