Merge commit 'v2.6.30-rc6' into x86/mm

Browse source

Merge reason: sync up to -rc6 which has changes to mm/ which we are
              going to touch in the commits to follow as well.

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

...

This commit is contained in:

Ingo Molnar 2009-05-18 09:12:45 +02:00

parent ed077b58f6 1406de8e11

commit b286e21868

394 changed files with 7992 additions and 5187 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

Documentation/DocBook/kgdb.tmpl

View file

28

Documentation/sysctl/vm.txt

View file

2

Documentation/sysfs-rules.txt

View file

2

Makefile

View file

26

arch/alpha/include/asm/percpu.h

View file

25

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

View file

2

arch/arm/mach-ixp4xx/ixp4xx_npe.c

View file

14

arch/cris/Makefile

View file

25

arch/cris/arch-v10/boot/compressed/README

View file

246

arch/cris/arch-v10/boot/compressed/misc.c

View file

14

arch/cris/arch-v10/kernel/entry.S

View file

20

arch/cris/arch-v32/boot/Makefile

View file

26

arch/cris/arch-v32/boot/compressed/Makefile

View file

26

arch/cris/arch-v32/boot/rescue/Makefile

View file

4

arch/cris/arch-v32/drivers/mach-a3/gpio.c

View file

2

arch/cris/arch-v32/kernel/Makefile

View file

8

arch/cris/arch-v32/kernel/entry.S

View file

0

arch/cris/arch-v10/boot/.gitignore → arch/cris/boot/.gitignore vendored

View file

8

arch/cris/arch-v10/boot/Makefile → arch/cris/boot/Makefile

View file

19

arch/cris/arch-v10/boot/compressed/Makefile → arch/cris/boot/compressed/Makefile

View file

0

arch/cris/arch-v32/boot/compressed/README → arch/cris/boot/compressed/README

View file

0

arch/cris/arch-v10/boot/compressed/decompress.lds → arch/cris/boot/compressed/decompress_v10.lds

View file

0

arch/cris/arch-v32/boot/compressed/decompress.lds → arch/cris/boot/compressed/decompress_v32.lds

View file

4

arch/cris/arch-v10/boot/compressed/head.S → arch/cris/boot/compressed/head_v10.S

View file

10

arch/cris/arch-v32/boot/compressed/head.S → arch/cris/boot/compressed/head_v32.S

View file

191

arch/cris/arch-v32/boot/compressed/misc.c → arch/cris/boot/compressed/misc.c

View file

22

arch/cris/arch-v10/boot/rescue/Makefile → arch/cris/boot/rescue/Makefile

View file

2

arch/cris/arch-v10/boot/rescue/head.S → arch/cris/boot/rescue/head_v10.S

View file

0

arch/cris/arch-v32/boot/rescue/head.S → arch/cris/boot/rescue/head_v32.S

View file

0

arch/cris/arch-v10/boot/rescue/kimagerescue.S → arch/cris/boot/rescue/kimagerescue.S

View file

0

arch/cris/arch-v10/boot/rescue/rescue.lds → arch/cris/boot/rescue/rescue_v10.lds

View file

0

arch/cris/arch-v32/boot/rescue/rescue.lds → arch/cris/boot/rescue/rescue_v32.lds

View file

0

arch/cris/arch-v10/boot/rescue/testrescue.S → arch/cris/boot/rescue/testrescue.S

View file

0

arch/cris/arch-v10/boot/tools/build.c → arch/cris/boot/tools/build.c

View file

12

arch/cris/include/asm/unistd.h

View file

20

arch/mips/Kconfig

View file

5

arch/mips/Makefile

View file

2

arch/mips/alchemy/common/time.c

View file

2

arch/mips/cavium-octeon/csrc-octeon.c

View file

4

arch/mips/include/asm/bitops.h

View file

4

arch/mips/include/asm/checksum.h

View file

1

arch/mips/include/asm/compat.h

View file

9

arch/mips/include/asm/cpu-features.h

View file

144

arch/mips/include/asm/div64.h

View file

9

arch/mips/include/asm/dma-mapping.h

View file

3

arch/mips/include/asm/fixmap.h

View file

5

arch/mips/include/asm/hazards.h

View file

6

arch/mips/include/asm/highmem.h

View file

6

arch/mips/include/asm/mach-au1x00/au1000.h

View file

17

arch/mips/include/asm/mach-au1x00/au1xxx_ide.h

View file

59

arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h

View file

38

arch/mips/include/asm/mipsregs.h

View file

3

arch/mips/include/asm/page.h

View file

6

arch/mips/include/asm/pgtable-64.h

View file

4

arch/mips/include/asm/sn/addrs.h

View file

4

arch/mips/include/asm/sn/nmi.h

View file

3

arch/mips/include/asm/thread_info.h

View file

6

arch/mips/include/asm/time.h

View file

66

arch/mips/include/asm/uaccess.h

View file

2

arch/mips/kernel/cevt-smtc.c

View file

4

arch/mips/kernel/scall64-n32.S

View file

4

arch/mips/kernel/scall64-o32.S

View file

6

arch/mips/kernel/unaligned.c

View file

9

arch/mips/lib/dump_tlb.c

View file

2

arch/mips/mm/c-r4k.c

View file

19

arch/mips/mm/dma-default.c

View file

25

arch/mips/mm/highmem.c

View file

26

arch/mips/mm/init.c

View file

4

arch/mips/mm/sc-rm7k.c

View file

12

arch/mips/pmc-sierra/Kconfig

View file

60

arch/mips/pmc-sierra/msp71xx/msp_prom.c

View file

8

arch/mips/pmc-sierra/msp71xx/msp_setup.c

View file

7

arch/mips/pmc-sierra/msp71xx/msp_time.c

View file

2

arch/mips/sgi-ip32/ip32-berr.c

View file

4

arch/mips/sgi-ip32/ip32-irq.c

View file

7

arch/mips/sibyte/bcm1480/irq.c

View file

7

arch/mips/sibyte/sb1250/irq.c

View file

2

arch/mips/txx9/generic/setup_tx4927.c

View file

2

arch/mips/txx9/generic/setup_tx4938.c

View file

2

arch/mips/txx9/generic/setup_tx4939.c

View file

2

arch/mips/txx9/rbtx4939/setup.c

View file

2

arch/powerpc/boot/Makefile

View file

10

arch/powerpc/boot/mktree.c

View file

104

arch/powerpc/configs/83xx/asp8347_defconfig

View file

114

arch/powerpc/configs/83xx/mpc8313_rdb_defconfig

View file

114

arch/powerpc/configs/83xx/mpc8315_rdb_defconfig

View file

107

arch/powerpc/configs/83xx/mpc832x_mds_defconfig

View file

113

arch/powerpc/configs/83xx/mpc832x_rdb_defconfig

View file

108

arch/powerpc/configs/83xx/mpc834x_itx_defconfig

View file

108

arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig

View file

103

arch/powerpc/configs/83xx/mpc834x_mds_defconfig

View file

108

arch/powerpc/configs/83xx/mpc836x_mds_defconfig

View file

96

arch/powerpc/configs/83xx/mpc836x_rdk_defconfig

View file

104

arch/powerpc/configs/83xx/mpc837x_mds_defconfig

View file

111

arch/powerpc/configs/83xx/mpc837x_rdb_defconfig

View file

96

arch/powerpc/configs/83xx/sbc834x_defconfig

View file

86

arch/powerpc/configs/85xx/ksi8560_defconfig

View file

82

arch/powerpc/configs/85xx/mpc8540_ads_defconfig

View file

89

arch/powerpc/configs/85xx/mpc8560_ads_defconfig

View file

88

arch/powerpc/configs/85xx/mpc85xx_cds_defconfig

View file

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