Merge branches 'sh/highmem' and 'sh/stable-updates'

Browse source

...

This commit is contained in:

Paul Mundt 2010-07-02 13:05:10 +09:00

parent 598ee698d9 97e0214044

commit 12462d77ec

530 changed files with 5112 additions and 3491 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

40

Documentation/ABI/testing/sysfs-bus-pci

View file

4

Documentation/kernel-parameters.txt

View file

5

Documentation/watchdog/watchdog-parameters.txt

View file

48

MAINTAINERS

View file

8

Makefile

View file

2

arch/alpha/include/asm/bitops.h

View file

20

arch/alpha/kernel/Makefile

View file

38

arch/alpha/kernel/ns87312.c

View file

88

arch/alpha/kernel/pc873xx.c

View file

35

arch/alpha/kernel/pc873xx.h

View file

3

arch/alpha/kernel/pci-sysfs.c

View file

23

arch/alpha/kernel/sys_sio.c

View file

9

arch/arm/common/sa1111.c

View file

1

arch/arm/mach-msm/dma.c

View file

11

arch/arm/mach-nomadik/clock.c

View file

2

arch/arm/mach-nomadik/clock.h

View file

8

arch/arm/mach-nomadik/cpu-8815.c

View file

4

arch/arm/mach-omap2/board-omap3stalker.c

View file

2

arch/arm/mach-omap2/clock44xx_data.c

View file

9

arch/arm/mach-omap2/omap_hwmod.c

View file

4

arch/arm/mach-omap2/pm34xx.c

View file

2

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

View file

4

arch/arm/mach-pxa/palmtc.c

View file

3

arch/arm/mach-pxa/spitz.c

View file

3

arch/arm/mach-ux500/Makefile

View file

104

arch/arm/mach-ux500/clock.c

View file

22

arch/arm/mach-ux500/clock.h

View file

6

arch/arm/mach-ux500/cpu.c

View file

1

arch/arm/mach-vexpress/ct-ca9x4.c

View file

4

arch/arm/mm/copypage-feroceon.c

View file

4

arch/arm/mm/copypage-v4wb.c

View file

4

arch/arm/mm/copypage-v4wt.c

View file

4

arch/arm/mm/copypage-xsc3.c

View file

3

arch/arm/mm/fault.c

View file

11

arch/arm/mm/highmem.c

View file

6

arch/arm/mm/init.c

View file

26

arch/arm/plat-nomadik/timer.c

View file

6

arch/arm/plat-omap/dmtimer.c

View file

1

arch/arm/plat-omap/gpio.c

View file

4

arch/arm/plat-omap/iovmm.c

View file

2

arch/arm/vfp/vfphw.S

View file

6

arch/frv/kernel/gdb-stub.c

View file

1

arch/ia64/kvm/kvm-ia64.c

View file

2

arch/ia64/mm/tlb.c

View file

2

arch/microblaze/include/asm/page.h

View file

1

arch/microblaze/kernel/dma.c

View file

1

arch/microblaze/pci/pci-common.c

View file

1

arch/mn10300/unit-asb2305/pci-asb2305.c

View file

7

arch/powerpc/Kconfig.debug

View file

2

arch/powerpc/boot/Makefile

View file

311

arch/powerpc/boot/addRamDisk.c

View file

28

arch/powerpc/boot/dts/lite5200.dts

View file

5

arch/powerpc/boot/dts/lite5200b.dts

View file

3

arch/powerpc/configs/40x/acadia_defconfig

View file

3

arch/powerpc/configs/40x/ep405_defconfig

View file

3

arch/powerpc/configs/40x/hcu4_defconfig

View file

3

arch/powerpc/configs/40x/kilauea_defconfig

View file

3

arch/powerpc/configs/40x/makalu_defconfig

View file

3

arch/powerpc/configs/40x/virtex_defconfig

View file

3

arch/powerpc/configs/40x/walnut_defconfig

View file

3

arch/powerpc/configs/44x/arches_defconfig

View file

3

arch/powerpc/configs/44x/bamboo_defconfig

View file

3

arch/powerpc/configs/44x/canyonlands_defconfig

View file

3

arch/powerpc/configs/44x/ebony_defconfig

View file

3

arch/powerpc/configs/44x/eiger_defconfig

View file

3

arch/powerpc/configs/44x/katmai_defconfig

View file

3

arch/powerpc/configs/44x/rainier_defconfig

View file

3

arch/powerpc/configs/44x/redwood_defconfig

View file

3

arch/powerpc/configs/44x/sam440ep_defconfig

View file

3

arch/powerpc/configs/44x/sequoia_defconfig

View file

3

arch/powerpc/configs/44x/taishan_defconfig

View file

3

arch/powerpc/configs/44x/virtex5_defconfig

View file

3

arch/powerpc/configs/52xx/cm5200_defconfig

View file

3

arch/powerpc/configs/52xx/lite5200b_defconfig

View file

3

arch/powerpc/configs/52xx/motionpro_defconfig

View file

3

arch/powerpc/configs/52xx/pcm030_defconfig

View file

3

arch/powerpc/configs/52xx/tqm5200_defconfig

View file

3

arch/powerpc/configs/86xx/gef_ppc9a_defconfig

View file

3

arch/powerpc/configs/86xx/gef_sbc310_defconfig

View file

3

arch/powerpc/configs/86xx/gef_sbc610_defconfig

View file

3

arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig

View file

3

arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig

View file

3

arch/powerpc/configs/86xx/sbc8641d_defconfig

View file

3

arch/powerpc/configs/adder875_defconfig

View file

3

arch/powerpc/configs/amigaone_defconfig

View file

3

arch/powerpc/configs/c2k_defconfig

View file

3

arch/powerpc/configs/cell_defconfig

View file

3

arch/powerpc/configs/celleb_defconfig

View file

3

arch/powerpc/configs/chrp32_defconfig

View file

3

arch/powerpc/configs/ep8248e_defconfig

View file

3

arch/powerpc/configs/ep88xc_defconfig

View file

3

arch/powerpc/configs/g5_defconfig

View file

3

arch/powerpc/configs/gamecube_defconfig

View file

1

arch/powerpc/configs/holly_defconfig

View file

3

arch/powerpc/configs/iseries_defconfig

View file

3

arch/powerpc/configs/linkstation_defconfig

View file

3

arch/powerpc/configs/maple_defconfig

View file

3

arch/powerpc/configs/mgcoge_defconfig

View file

3

arch/powerpc/configs/mgsuvd_defconfig

View file

3

arch/powerpc/configs/mpc512x_defconfig

View file

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