Merge branch 'sched/urgent' into sched/core

Browse source

Merge reason: avoid upcoming patch conflict.

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

...

This commit is contained in:

Ingo Molnar 2009-08-02 14:11:26 +02:00

parent 716a42348c 07903af152

commit 8e9ed8b024

652 changed files with 25996 additions and 12837 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

8

CREDITS

View file

7

Documentation/RCU/rculist_nulls.txt

View file

4

Documentation/connector/cn_test.c

View file

2

Documentation/connector/ucon.c

View file

3

Documentation/filesystems/sysfs.txt

View file

721

Documentation/lguest/lguest.c

View file

2

Documentation/networking/6pack.txt

View file

5

Documentation/sound/alsa/Procfile.txt

View file

7

Documentation/sysrq.txt

View file

2

Documentation/video4linux/CARDLIST.em28xx

View file

32

Documentation/video4linux/gspca.txt

View file

2778

MAINTAINERS

View file

File diff suppressed because it is too large Load diff

2

Makefile

View file

4

arch/alpha/include/asm/tlb.h

View file

18

arch/arm/configs/u300_defconfig

View file

4

arch/arm/include/asm/tlb.h

View file

102

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

View file

1

arch/arm/mach-ep93xx/dma-m2p.c

View file

2

arch/arm/mach-kirkwood/mpp.h

View file

8

arch/arm/mach-mx3/Kconfig

View file

1

arch/arm/mach-mx3/Makefile

View file

63

arch/arm/mach-mx3/armadillo5x0.c

View file

1

arch/arm/mach-mx3/devices.c

View file

183

arch/arm/mach-mx3/pcm037.c

View file

11

arch/arm/mach-mx3/pcm037.h

View file

204

arch/arm/mach-mx3/pcm037_eet.c

View file

6

arch/arm/mach-pxa/include/mach/mfp-pxa300.h

View file

2

arch/arm/mach-pxa/pxa3xx.c

View file

3

arch/arm/mach-realview/core.c

View file

4

arch/arm/mach-u300/core.c

View file

3

arch/arm/mach-versatile/core.c

View file

2

arch/arm/plat-mxc/include/mach/iomux-mx3.h

View file

9

arch/arm/plat-pxa/gpio.c

View file

2

arch/avr32/include/asm/pgalloc.h

View file

7

arch/blackfin/include/asm/context.S

View file

1

arch/blackfin/include/asm/cpu.h

View file

3

arch/blackfin/include/asm/hardirq.h

View file

21

arch/blackfin/include/asm/processor.h

View file

39

arch/blackfin/kernel/bfin_dma_5xx.c

View file

6

arch/blackfin/kernel/bfin_gpio.c

View file

23

arch/blackfin/kernel/cplb-nompu/cplbinit.c

View file

14

arch/blackfin/kernel/process.c

View file

42

arch/blackfin/kernel/setup.c

View file

9

arch/blackfin/kernel/traps.c

View file

16

arch/blackfin/lib/lshrdi3.c

View file

2

arch/blackfin/mach-bf518/boards/ezbrd.c

View file

2

arch/blackfin/mach-bf518/include/mach/anomaly.h

View file

2

arch/blackfin/mach-bf518/include/mach/bfin_serial_5xx.h

View file

2

arch/blackfin/mach-bf527/boards/cm_bf527.c

View file

2

arch/blackfin/mach-bf527/boards/ezbrd.c

View file

2

arch/blackfin/mach-bf527/boards/ezkit.c

View file

4

arch/blackfin/mach-bf527/include/mach/anomaly.h

View file

2

arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h

View file

2

arch/blackfin/mach-bf533/boards/stamp.c

View file

1

arch/blackfin/mach-bf533/include/mach/anomaly.h

View file

2

arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h

View file

4

arch/blackfin/mach-bf537/boards/stamp.c

View file

2

arch/blackfin/mach-bf537/include/mach/anomaly.h

View file

2

arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h

View file

2

arch/blackfin/mach-bf538/include/mach/anomaly.h

View file

2

arch/blackfin/mach-bf538/include/mach/bfin_serial_5xx.h

View file

2

arch/blackfin/mach-bf548/boards/ezkit.c

View file

2

arch/blackfin/mach-bf548/include/mach/anomaly.h

View file

1

arch/blackfin/mach-bf561/include/mach/anomaly.h

View file

2

arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h

View file

23

arch/blackfin/mach-bf561/include/mach/mem_map.h

View file

12

arch/blackfin/mach-common/entry.S

View file

10

arch/blackfin/mach-common/smp.c

View file

2

arch/cris/include/asm/pgalloc.h

View file

4

arch/frv/include/asm/pgalloc.h

View file

2

arch/frv/include/asm/pgtable.h

View file

6

arch/ia64/include/asm/pgalloc.h

View file

12

arch/ia64/include/asm/tlb.h

View file

4

arch/m32r/include/asm/pgalloc.h

View file

6

arch/m68k/include/asm/motorola_pgalloc.h

View file

4

arch/m68k/include/asm/sun3_pgalloc.h

View file

35

arch/microblaze/Makefile

View file

1

arch/microblaze/include/asm/io.h

View file

4

arch/microblaze/include/asm/pgalloc.h

View file

6

arch/microblaze/include/asm/pgtable.h

View file

23

arch/microblaze/include/asm/prom.h

View file

2

arch/microblaze/include/asm/tlb.h

View file

2

arch/microblaze/include/asm/uaccess.h

View file

2

arch/microblaze/kernel/Makefile

View file

2

arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c

View file

2

arch/microblaze/kernel/cpu/cpuinfo-static.c

View file

2

arch/microblaze/kernel/cpu/cpuinfo.c

View file

17

arch/microblaze/kernel/head.S

View file

109

arch/microblaze/kernel/hw_exception_handler.S

View file

19

arch/microblaze/kernel/module.c

View file

8

arch/microblaze/kernel/setup.c

View file

99

arch/microblaze/kernel/sys_microblaze.c

View file

2

arch/microblaze/kernel/syscall_table.S

View file

15

arch/microblaze/mm/fault.c

View file

15

arch/mips/include/asm/pgalloc.h

View file

2

arch/mn10300/include/asm/pgalloc.h

View file

2

arch/mn10300/kernel/vmlinux.lds.S

View file

4

arch/parisc/include/asm/tlb.h

View file

2

arch/powerpc/boot/dts/mpc8377_rdb.dts

View file

2

arch/powerpc/boot/dts/mpc8378_rdb.dts

View file

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