Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable

Browse source

Conflicts:
	arch/arm/Makefile

...

This commit is contained in:

Russell King 2010-02-15 21:20:18 +00:00

parent a814290e17 b2a731aa5c

commit 56012808f4

935 changed files with 25579 additions and 8906 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

4

Documentation/fault-injection/fault-injection.txt

View file

49

Documentation/feature-removal-schedule.txt

View file

48

Documentation/input/multi-touch-protocol.txt

View file

26

Documentation/trace/ftrace-design.txt

View file

2

Documentation/trace/ftrace.txt

View file

18

MAINTAINERS

View file

2

Makefile

View file

3

arch/alpha/include/asm/topology.h

View file

71

arch/arm/Kconfig

View file

6

arch/arm/Makefile

View file

8

arch/arm/boot/compressed/head.S

View file

13

arch/arm/boot/compressed/misc.c

View file

128

arch/arm/configs/kirkwood_defconfig

View file

101

arch/arm/configs/orion5x_defconfig

View file

20

arch/arm/include/asm/cacheflush.h

View file

20

arch/arm/kernel/debug.S

View file

9

arch/arm/kernel/elf.c

View file

1

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

View file

8

arch/arm/mach-dove/common.c

View file

4

arch/arm/mach-gemini/include/mach/uncompress.h

View file

17

arch/arm/mach-kirkwood/Kconfig

View file

3

arch/arm/mach-kirkwood/Makefile

View file

8

arch/arm/mach-kirkwood/common.c

View file

59

arch/arm/mach-kirkwood/netspace_v2-setup.c

View file

118

arch/arm/mach-kirkwood/openrd-setup.c

View file

96

arch/arm/mach-kirkwood/openrd_base-setup.c

View file

6

arch/arm/mach-kirkwood/rd88f6192-nas-setup.c

View file

58

arch/arm/mach-mx25/clock.c

View file

2

arch/arm/mach-mx25/mx25pdk.c

View file

4

arch/arm/mach-mx3/mx31ads.c

View file

6

arch/arm/mach-omap1/clock.c

View file

4

arch/arm/mach-omap2/clock34xx_data.c

View file

62

arch/arm/mach-omap2/clock44xx_data.c

View file

2

arch/arm/mach-omap2/cpuidle34xx.c

View file

7

arch/arm/mach-omap2/gpmc.c

View file

41

arch/arm/mach-omap2/id.c

View file

22

arch/arm/mach-omap2/irq.c

View file

37

arch/arm/mach-omap2/mux.c

View file

24

arch/arm/mach-omap2/mux.h

View file

47

arch/arm/mach-omap2/mux34xx.c

View file

3

arch/arm/mach-omap2/omap_hwmod.c

View file

12

arch/arm/mach-omap2/pm-debug.c

View file

8

arch/arm/mach-omap2/pm.h

View file

47

arch/arm/mach-omap2/pm34xx.c

View file

11

arch/arm/mach-omap2/prcm.c

View file

2

arch/arm/mach-omap2/prm.h

View file

32

arch/arm/mach-omap2/prm44xx.h

View file

11

arch/arm/mach-omap2/serial.c

View file

13

arch/arm/mach-omap2/sleep34xx.S

View file

7

arch/arm/mach-orion5x/Kconfig

View file

1

arch/arm/mach-orion5x/Makefile

View file

4

arch/arm/mach-orion5x/common.c

View file

45

arch/arm/mach-orion5x/d2net-setup.c

View file

67

arch/arm/mach-orion5x/dns323-setup.c

View file

276

arch/arm/mach-orion5x/ls_hgl-setup.c

View file

8

arch/arm/mach-orion5x/lsmini-setup.c

View file

79

arch/arm/mach-orion5x/wrt350n-v2-setup.c

View file

1

arch/arm/mach-pxa/corgi.c

View file

6

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

View file

14

arch/arm/mach-pxa/irq.c

View file

4

arch/arm/mach-realview/realview_pbx.c

View file

2

arch/arm/mach-s3c6410/mach-hmt.c

View file

2

arch/arm/mm/mmu.c

View file

2

arch/arm/mm/proc-arm6_7.S

View file

2

arch/arm/mm/proc-v6.S

View file

11

arch/arm/mm/proc-v7.S

View file

137

arch/arm/plat-mxc/audmux-v2.c

View file

2

arch/arm/plat-mxc/include/mach/board-mx31lite.h

View file

2

arch/arm/plat-mxc/include/mach/common.h

View file

2

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

View file

5

arch/arm/plat-mxc/include/mach/irqs.h

View file

4

arch/arm/plat-mxc/include/mach/uncompress.h

View file

4

arch/arm/plat-omap/clock.c

View file

26

arch/arm/plat-omap/common.c

View file

2

arch/arm/plat-omap/dma.c

View file

13

arch/arm/plat-omap/dmtimer.c

View file

4

arch/arm/plat-omap/gpio.c

View file

1

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

View file

3

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

View file

1

arch/arm/plat-omap/include/plat/omap_hwmod.h

View file

10

arch/arm/plat-omap/omap_device.c

View file

6

arch/arm/plat-orion/pcie.c

View file

60

arch/arm/tools/mach-types

View file

5

arch/arm/vfp/vfpmodule.c

View file

1

arch/m68knommu/platform/coldfire/pit.c

View file

2

arch/microblaze/Kconfig

View file

112

arch/microblaze/configs/mmu_defconfig

View file

101

arch/microblaze/configs/nommu_defconfig

View file

14

arch/microblaze/include/asm/ptrace.h

View file

5

arch/microblaze/include/asm/unistd.h

View file

10

arch/microblaze/kernel/entry-nommu.S

View file

2

arch/microblaze/kernel/prom_parse.c

View file

2

arch/microblaze/kernel/syscall_table.S

View file

1

arch/mips/Kconfig

View file

7

arch/mips/alchemy/common/dbdma.c

View file

2

arch/mips/ar7/platform.c

View file

9

arch/mips/boot/compressed/Makefile

View file

4

arch/mips/boot/compressed/decompress.c

View file

7

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

View file

3

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

View file

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