Merge branch 'linus' into x86/apic

Browse source

Merge reason: new intr-remap patches depend on the s2ram iommu fixes from upstream

Signed-off-by: Ingo Molnar <mingo@elte.hu>

...

This commit is contained in:

Ingo Molnar 2009-04-17 16:18:22 +02:00

parent 77857dc072 9f76208c33

commit 5043124e66

1338 changed files with 60208 additions and 56071 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/ABI/testing/debugfs-pktcdvd

View file

11

Documentation/DocBook/Makefile

View file

19

Documentation/block/biodoc.txt

View file

18

Documentation/cgroups/cpuacct.txt

View file

51

Documentation/cgroups/memory.txt

View file

27

Documentation/cgroups/resource_counter.txt

View file

9

Documentation/feature-removal-schedule.txt

View file

45

Documentation/infiniband/ipoib.txt

View file

101

Documentation/input/rotary-encoder.txt

View file

83

Documentation/kbuild/makefiles.txt

View file

2

Documentation/networking/bonding.txt

View file

44

Documentation/powerpc/dts-bindings/fsl/i2c.txt

View file

4

Documentation/sound/alsa/HD-Audio.txt

View file

8

Documentation/sparse.txt

View file

2

Documentation/sysctl/net.txt

View file

55

Documentation/tomoyo.txt

View file

0

Documentation/ftrace.txt → Documentation/trace/ftrace.txt

View file

0

Documentation/vm/kmemtrace.txt → Documentation/trace/kmemtrace.txt

View file

0

Documentation/tracers/mmiotrace.txt → Documentation/trace/mmiotrace.txt

View file

0

Documentation/tracepoints.txt → Documentation/trace/tracepoints.txt

View file

2

Documentation/vm/00-INDEX

View file

83

Documentation/vm/active_mm.txt

View file

947

Documentation/vm/unevictable-lru.txt

View file

1628

MAINTAINERS

View file

File diff suppressed because it is too large Load diff

17

Makefile

View file

3

arch/Kconfig

View file

6

arch/arm/configs/magician_defconfig

View file

1

arch/arm/include/asm/sizes.h

View file

2

arch/arm/mach-at91/include/mach/board.h

View file

23

arch/arm/mach-omap1/clock.c

View file

8

arch/arm/mach-omap2/usb-musb.c

View file

9

arch/arm/mach-pxa/Kconfig

View file

1

arch/arm/mach-pxa/Makefile

View file

2

arch/arm/mach-pxa/cm-x2xx.c

View file

11

arch/arm/mach-pxa/colibri-pxa300.c

View file

10

arch/arm/mach-pxa/colibri-pxa320.c

View file

35

arch/arm/mach-pxa/colibri-pxa3xx.c

View file

5

arch/arm/mach-pxa/csb701.c

View file

2

arch/arm/mach-pxa/e740.c

View file

2

arch/arm/mach-pxa/e750.c

View file

2

arch/arm/mach-pxa/e800.c

View file

86

arch/arm/mach-pxa/em-x270.c

View file

7

arch/arm/mach-pxa/include/mach/colibri.h

View file

4

arch/arm/mach-pxa/include/mach/magician.h

View file

1

arch/arm/mach-pxa/include/mach/palmld.h

View file

1

arch/arm/mach-pxa/include/mach/palmt5.h

View file

68

arch/arm/mach-pxa/include/mach/palmte2.h

View file

2

arch/arm/mach-pxa/include/mach/palmtx.h

View file

84

arch/arm/mach-pxa/magician.c

View file

6

arch/arm/mach-pxa/mioa701.c

View file

36

arch/arm/mach-pxa/palmld.c

View file

35

arch/arm/mach-pxa/palmt5.c

View file

466

arch/arm/mach-pxa/palmte2.c

View file

35

arch/arm/mach-pxa/palmtx.c

View file

2

arch/arm/mach-pxa/tosa.c

View file

11

arch/arm/mm/mmu.c

View file

0

include/asm-frv/Kbuild → arch/frv/include/asm/Kbuild

View file

0

include/asm-frv/atomic.h → arch/frv/include/asm/atomic.h

View file

0

include/asm-frv/auxvec.h → arch/frv/include/asm/auxvec.h

View file

0

include/asm-frv/ax88796.h → arch/frv/include/asm/ax88796.h

View file

0

include/asm-frv/bitops.h → arch/frv/include/asm/bitops.h

View file

0

include/asm-frv/bug.h → arch/frv/include/asm/bug.h

View file

0

include/asm-frv/bugs.h → arch/frv/include/asm/bugs.h

View file

0

include/asm-frv/busctl-regs.h → arch/frv/include/asm/busctl-regs.h

View file

0

include/asm-frv/byteorder.h → arch/frv/include/asm/byteorder.h

View file

0

include/asm-frv/cache.h → arch/frv/include/asm/cache.h

View file

0

include/asm-frv/cacheflush.h → arch/frv/include/asm/cacheflush.h

View file

0

include/asm-frv/checksum.h → arch/frv/include/asm/checksum.h

View file

0

include/asm-frv/cpu-irqs.h → arch/frv/include/asm/cpu-irqs.h

View file

0

include/asm-frv/cpumask.h → arch/frv/include/asm/cpumask.h

View file

0

include/asm-frv/cputime.h → arch/frv/include/asm/cputime.h

View file

0

include/asm-frv/current.h → arch/frv/include/asm/current.h

View file

0

include/asm-frv/delay.h → arch/frv/include/asm/delay.h

View file

0

include/asm-frv/device.h → arch/frv/include/asm/device.h

View file

0

include/asm-frv/div64.h → arch/frv/include/asm/div64.h

View file

0

include/asm-frv/dm9000.h → arch/frv/include/asm/dm9000.h

View file

0

include/asm-frv/dma-mapping.h → arch/frv/include/asm/dma-mapping.h

View file

0

include/asm-frv/dma.h → arch/frv/include/asm/dma.h

View file

0

include/asm-frv/elf.h → arch/frv/include/asm/elf.h

View file

0

include/asm-frv/emergency-restart.h → arch/frv/include/asm/emergency-restart.h

View file

0

include/asm-frv/errno.h → arch/frv/include/asm/errno.h

View file

0

include/asm-frv/fb.h → arch/frv/include/asm/fb.h

View file

0

include/asm-frv/fcntl.h → arch/frv/include/asm/fcntl.h

View file

0

include/asm-frv/fpu.h → arch/frv/include/asm/fpu.h

View file

0

include/asm-frv/ftrace.h → arch/frv/include/asm/ftrace.h

View file

0

include/asm-frv/futex.h → arch/frv/include/asm/futex.h

View file

0

include/asm-frv/gdb-stub.h → arch/frv/include/asm/gdb-stub.h

View file

0

include/asm-frv/gpio-regs.h → arch/frv/include/asm/gpio-regs.h

View file

0

include/asm-frv/hardirq.h → arch/frv/include/asm/hardirq.h

View file

0

include/asm-frv/highmem.h → arch/frv/include/asm/highmem.h

View file

0

include/asm-frv/hw_irq.h → arch/frv/include/asm/hw_irq.h

View file

0

include/asm-frv/init.h → arch/frv/include/asm/init.h

View file

0

include/asm-frv/io.h → arch/frv/include/asm/io.h

View file

0

include/asm-frv/ioctl.h → arch/frv/include/asm/ioctl.h

View file

0

include/asm-frv/ioctls.h → arch/frv/include/asm/ioctls.h

View file

0

include/asm-frv/ipcbuf.h → arch/frv/include/asm/ipcbuf.h

View file

0

include/asm-frv/irc-regs.h → arch/frv/include/asm/irc-regs.h

View file

0

include/asm-frv/irq.h → arch/frv/include/asm/irq.h

View file

0

include/asm-frv/irq_regs.h → arch/frv/include/asm/irq_regs.h

View file

0

include/asm-frv/kdebug.h → arch/frv/include/asm/kdebug.h

View file

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