Merge branch 'x86/irq' into x86/apic

Browse source

Merge reason:
	Conflicts in arch/x86/kernel/apic/io_apic.c

Resolved Conflicts:
	arch/x86/kernel/apic/io_apic.c

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

...

This commit is contained in:

H. Peter Anvin 2010-02-22 16:20:34 -08:00

parent 0fdc7a8022 aef55d4922

commit d02e30c31c

1741 changed files with 42946 additions and 18445 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

1

.gitignore vendored

View file

12

Documentation/ABI/testing/ima_policy

View file

12

Documentation/DocBook/mtdnand.tmpl

View file

2

Documentation/IO-mapping.txt

View file

0

Documentation/DMA-mapping.txt → Documentation/PCI/PCI-DMA-mapping.txt

View file

2

Documentation/block/00-INDEX

View file

172

Documentation/block/as-iosched.txt

View file

2

Documentation/block/biodoc.txt

View file

4

Documentation/cpu-freq/governors.txt

View file

4

Documentation/fault-injection/fault-injection.txt

View file

49

Documentation/feature-removal-schedule.txt

View file

2

Documentation/filesystems/ext4.txt

View file

2

Documentation/filesystems/nilfs2.txt

View file

2

Documentation/filesystems/proc.txt

View file

102

Documentation/hwmon/amc6821

View file

17

Documentation/hwmon/k10temp

View file

48

Documentation/input/multi-touch-protocol.txt

View file

203

Documentation/ioctl/ioctl-number.txt

View file

12

Documentation/kernel-doc-nano-HOWTO.txt

View file

11

Documentation/kernel-parameters.txt

View file

10

Documentation/kvm/api.txt

View file

58

Documentation/laptops/thinkpad-acpi.txt

View file

12

Documentation/networking/3c509.txt

View file

2

Documentation/sound/alsa/Procfile.txt

View file

40

Documentation/trace/ftrace-design.txt

View file

2

Documentation/trace/ftrace.txt

View file

15

Documentation/trace/mmiotrace.txt

View file

56

Documentation/trace/ring-buffer-design.txt

View file

60

Documentation/trace/tracepoint-analysis.txt

View file

2

Documentation/vgaarbiter.txt

View file

53

MAINTAINERS

View file

5

Makefile

View file

3

arch/alpha/include/asm/topology.h

View file

74

arch/arm/Kconfig

View file

6

arch/arm/Makefile

View file

34

arch/arm/boot/compressed/Makefile

View file

8

arch/arm/boot/compressed/head.S

View file

129

arch/arm/boot/compressed/misc.c

View file

6

arch/arm/boot/compressed/piggy.gzip.S

View file

2

arch/arm/boot/compressed/piggy.S → arch/arm/boot/compressed/piggy.lzo.S

View file

81

arch/arm/configs/u300_defconfig

View file

20

arch/arm/include/asm/cacheflush.h

View file

1

arch/arm/include/asm/cpu.h

View file

4

arch/arm/include/asm/dma.h

View file

6

arch/arm/include/asm/ptrace.h

View file

1

arch/arm/include/asm/unistd.h

View file

20

arch/arm/kernel/debug.S

View file

9

arch/arm/kernel/elf.c

View file

4

arch/arm/kernel/entry-armv.S

View file

3

arch/arm/kernel/process.c

View file

1

arch/arm/mach-davinci/board-dm355-evm.c

View file

11

arch/arm/mach-davinci/board-dm365-evm.c

View file

1

arch/arm/mach-davinci/board-dm644x-evm.c

View file

11

arch/arm/mach-davinci/cp_intc.c

View file

9

arch/arm/mach-davinci/devices-da8xx.c

View file

1

arch/arm/mach-davinci/dm365.c

View file

1

arch/arm/mach-davinci/include/mach/keyscan.h

View file

4

arch/arm/mach-gemini/include/mach/uncompress.h

View file

6

arch/arm/mach-kirkwood/rd88f6192-nas-setup.c

View file

2

arch/arm/mach-lh7a40x/clocks.c

View file

2

arch/arm/mach-mmp/ttc_dkb.c

View file

24

arch/arm/mach-mx2/mxt_td60.c

View file

58

arch/arm/mach-mx25/clock.c

View file

19

arch/arm/mach-mx25/devices.c

View file

1

arch/arm/mach-mx25/devices.h

View file

48

arch/arm/mach-mx25/mx25pdk.c

View file

3

arch/arm/mach-mx3/Kconfig

View file

5

arch/arm/mach-mx3/mm.c

View file

9

arch/arm/mach-mx3/mx31ads.c

View file

9

arch/arm/mach-mx3/mx31lite.c

View file

2

arch/arm/mach-mx3/mx31moboard-devboard.c

View file

2

arch/arm/mach-mx3/mx31moboard-marxbot.c

View file

7

arch/arm/mach-mx3/mx31moboard.c

View file

5

arch/arm/mach-mx3/mx31pdk.c

View file

32

arch/arm/mach-mx3/pcm037.c

View file

6

arch/arm/mach-omap1/clock.c

View file

10

arch/arm/mach-omap1/clock_data.c

View file

35

arch/arm/mach-omap1/devices.c

View file

8

arch/arm/mach-omap1/mux.c

View file

1

arch/arm/mach-omap2/Kconfig

View file

8

arch/arm/mach-omap2/board-zoom-peripherals.c

View file

57

arch/arm/mach-omap2/clock2xxx.c

View file

1

arch/arm/mach-omap2/clock34xx.c

View file

10

arch/arm/mach-omap2/clock34xx_data.c

View file

62

arch/arm/mach-omap2/clock44xx_data.c

View file

4

arch/arm/mach-omap2/clockdomain.c

View file

2

arch/arm/mach-omap2/cpuidle34xx.c

View file

7

arch/arm/mach-omap2/gpmc.c

View file

41

arch/arm/mach-omap2/id.c

View file

19

arch/arm/mach-omap2/io.c

View file

22

arch/arm/mach-omap2/irq.c

View file

43

arch/arm/mach-omap2/mux.c

View file

24

arch/arm/mach-omap2/mux.h

View file

47

arch/arm/mach-omap2/mux34xx.c

View file

3

arch/arm/mach-omap2/omap_hwmod.c

View file

38

arch/arm/mach-omap2/opp2420_data.c

View file

30

arch/arm/mach-omap2/opp2430_data.c

View file

12

arch/arm/mach-omap2/pm-debug.c

View file

8

arch/arm/mach-omap2/pm.h

View file

51

arch/arm/mach-omap2/pm34xx.c

View file

Some files were not shown because too many files have changed in this diff Show more