Merge branch 'linus' into cpus4096

Browse source

Conflicts:

	arch/x86/xen/smp.c
	kernel/sched_rt.c
	net/iucv/iucv.c

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

...

This commit is contained in:

Ingo Molnar 2008-07-16 00:29:07 +02:00

parent 9982fbface 63cf13b77a

commit 82638844d9

2694 changed files with 241750 additions and 174787 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

include/Kbuild

View file

5

include/asm-alpha/smp.h

View file

7

include/asm-arm/arch-at91/at91_pmc.h

View file

2

include/asm-arm/arch-at91/at91cap9.h

View file

5

include/asm-arm/arch-at91/at91cap9_matrix.h

View file

11

include/asm-arm/arch-at91/at91sam9260.h

View file

2

include/asm-arm/arch-at91/at91sam9rl.h

View file

6

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

View file

7

include/asm-arm/arch-at91/cpu.h

View file

2

include/asm-arm/arch-at91/hardware.h

View file

22

include/asm-arm/arch-at91/timex.h

View file

26

include/asm-arm/arch-ebsa285/hardware.h

View file

19

include/asm-arm/arch-ebsa285/memory.h

View file

4

include/asm-arm/arch-ebsa285/vmalloc.h

View file

8

include/asm-arm/arch-imx/hardware.h

View file

2

include/asm-arm/arch-imx/imx-dma.h

View file

2

include/asm-arm/arch-imx/imx-uart.h

View file

2

include/asm-arm/arch-iop13xx/dma.h

View file

6

include/asm-arm/arch-iop32x/gpio.h

View file

6

include/asm-arm/arch-iop33x/gpio.h

View file

50

include/asm-arm/arch-ixp4xx/fsg.h

View file

1

include/asm-arm/arch-ixp4xx/hardware.h

View file

7

include/asm-arm/arch-ixp4xx/irqs.h

View file

20

include/asm-arm/arch-kirkwood/debug-macro.S

View file

1

include/asm-arm/arch-kirkwood/dma.h

View file

40

include/asm-arm/arch-kirkwood/entry-macro.S

View file

21

include/asm-arm/arch-kirkwood/hardware.h

View file

26

include/asm-arm/arch-kirkwood/io.h

View file

63

include/asm-arm/arch-kirkwood/irqs.h

View file

100

include/asm-arm/arch-kirkwood/kirkwood.h

View file

14

include/asm-arm/arch-kirkwood/memory.h

View file

37

include/asm-arm/arch-kirkwood/system.h

View file

11

include/asm-arm/arch-kirkwood/timex.h

View file

47

include/asm-arm/arch-kirkwood/uncompress.h

View file

5

include/asm-arm/arch-kirkwood/vmalloc.h

View file

20

include/asm-arm/arch-loki/debug-macro.S

View file

1

include/asm-arm/arch-loki/dma.h

View file

30

include/asm-arm/arch-loki/entry-macro.S

View file

15

include/asm-arm/arch-loki/hardware.h

View file

26

include/asm-arm/arch-loki/io.h

View file

58

include/asm-arm/arch-loki/irqs.h

View file

97

include/asm-arm/arch-loki/loki.h

View file

14

include/asm-arm/arch-loki/memory.h

View file

37

include/asm-arm/arch-loki/system.h

View file

11

include/asm-arm/arch-loki/timex.h

View file

47

include/asm-arm/arch-loki/uncompress.h

View file

5

include/asm-arm/arch-loki/vmalloc.h

View file

1

include/asm-arm/arch-msm/irqs.h

View file

1

include/asm-arm/arch-msm/timex.h

View file

20

include/asm-arm/arch-mv78xx0/debug-macro.S

View file

1

include/asm-arm/arch-mv78xx0/dma.h

View file

39

include/asm-arm/arch-mv78xx0/entry-macro.S

View file

21

include/asm-arm/arch-mv78xx0/hardware.h

View file

26

include/asm-arm/arch-mv78xx0/io.h

View file

91

include/asm-arm/arch-mv78xx0/irqs.h

View file

14

include/asm-arm/arch-mv78xx0/memory.h

View file

126

include/asm-arm/arch-mv78xx0/mv78xx0.h

View file

37

include/asm-arm/arch-mv78xx0/system.h

View file

9

include/asm-arm/arch-mv78xx0/timex.h

View file

47

include/asm-arm/arch-mv78xx0/uncompress.h

View file

5

include/asm-arm/arch-mv78xx0/vmalloc.h

View file

354

include/asm-arm/arch-mxc/board-mx27ads.h

View file

5

include/asm-arm/arch-mxc/board-mx31ads.h

View file

38

include/asm-arm/arch-mxc/board-mx31lite.h

View file

27

include/asm-arm/arch-mxc/board-pcm037.h

View file

41

include/asm-arm/arch-mxc/board-pcm038.h

View file

67

include/asm-arm/arch-mxc/clock.h

View file

6

include/asm-arm/arch-mxc/common.h

View file

49

include/asm-arm/arch-mxc/debug-macro.S

View file

42

include/asm-arm/arch-mxc/gpio.h

View file

38

include/asm-arm/arch-mxc/hardware.h

View file

77

include/asm-arm/arch-mxc/iim.h

View file

32

include/asm-arm/arch-mxc/imx-uart.h

View file

372

include/asm-arm/arch-mxc/iomux-mx1-mx2.h

View file

501

include/asm-arm/arch-mxc/iomux-mx3.h

View file

13

include/asm-arm/arch-mxc/irqs.h

View file

302

include/asm-arm/arch-mxc/mx27.h

View file

21

include/asm-arm/arch-mxc/mx31.h

View file

152

include/asm-arm/arch-mxc/mxc.h

View file

158

include/asm-arm/arch-mxc/mxc_timer.h

View file

4

include/asm-arm/arch-ns9xxx/hardware.h

View file

5

include/asm-arm/arch-omap/board-2430sdp.h

View file

6

include/asm-arm/arch-omap/board-h3.h

View file

3

include/asm-arm/arch-omap/board-innovator.h

View file

6

include/asm-arm/arch-omap/board-perseus2.h

View file

17

include/asm-arm/arch-omap/clock.h

View file

15

include/asm-arm/arch-omap/common.h

View file

4

include/asm-arm/arch-omap/control.h

View file

39

include/asm-arm/arch-omap/cpu.h

View file

370

include/asm-arm/arch-omap/dma.h

View file

1

include/asm-arm/arch-omap/dmtimer.h

View file

49

include/asm-arm/arch-omap/fpga.h

View file

1

include/asm-arm/arch-omap/hardware.h

View file

26

include/asm-arm/arch-omap/io.h

View file

44

include/asm-arm/arch-omap/irqs.h

View file

62

include/asm-arm/arch-omap/mcbsp.h

View file

72

include/asm-arm/arch-omap/omap34xx.h

View file

37

include/asm-arm/arch-omap/sram.h

View file

10

include/asm-arm/arch-omap/tc.h

View file

23

include/asm-arm/arch-omap/usb.h

View file

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