Merge branch 'omap/omap4' into next/pm

Browse source

...

This commit is contained in:

Olof Johansson 2011-12-11 15:56:44 -08:00

parent 5611cc4572 eb3e1d9ded

commit 05da34d832

365 changed files with 3968 additions and 3374 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

11

Documentation/arm/memory.txt

View file

4

Documentation/devicetree/bindings/arm/gic.txt

View file

29

Documentation/devicetree/bindings/arm/vic.txt

View file

6

arch/arm/common/Kconfig

View file

165

arch/arm/common/gic.c

View file

143

arch/arm/common/vic.c

View file

179

arch/arm/include/asm/cti.h

View file

57

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

View file

60

arch/arm/include/asm/hardware/entry-macro-gic.S

View file

26

arch/arm/include/asm/hardware/gic.h

View file

12

arch/arm/include/asm/hardware/vic.h

View file

9

arch/arm/include/asm/mach/arch.h

View file

3

arch/arm/include/asm/perf_event.h

View file

13

arch/arm/include/asm/pgtable.h

View file

15

arch/arm/include/asm/pmu.h

View file

1

arch/arm/include/asm/system.h

View file

7

arch/arm/kernel/entry-armv.S

View file

4

arch/arm/kernel/machine_kexec.c

View file

19

arch/arm/kernel/perf_event.c

View file

32

arch/arm/kernel/perf_event_v6.c

View file

399

arch/arm/kernel/perf_event_v7.c

View file

16

arch/arm/kernel/perf_event_xscale.c

View file

35

arch/arm/kernel/process.c

View file

15

arch/arm/kernel/setup.c

View file

8

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

View file

28

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

View file

18

arch/arm/mach-at91/setup.c

View file

2

arch/arm/mach-bcmring/dma.c

View file

25

arch/arm/mach-bcmring/include/mach/vmalloc.h

View file

2

arch/arm/mach-clps711x/Makefile

View file

95

arch/arm/mach-clps711x/irq.c → arch/arm/mach-clps711x/common.c

View file

2

arch/arm/mach-clps711x/include/mach/system.h

View file

20

arch/arm/mach-clps711x/include/mach/vmalloc.h

View file

48

arch/arm/mach-clps711x/mm.c

View file

84

arch/arm/mach-clps711x/time.c

View file

2

arch/arm/mach-cns3xxx/cns3420vb.c

View file

2

arch/arm/mach-cns3xxx/include/mach/entry-macro.S

View file

11

arch/arm/mach-cns3xxx/include/mach/vmalloc.h

View file

2

arch/arm/mach-davinci/Makefile

View file

8

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

View file

14

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

View file

48

arch/arm/mach-davinci/io.c

View file

2

arch/arm/mach-dove/include/mach/dove.h

View file

5

arch/arm/mach-dove/include/mach/vmalloc.h

View file

2

arch/arm/mach-ebsa110/core.c

View file

2

arch/arm/mach-ebsa110/include/mach/system.h

View file

10

arch/arm/mach-ebsa110/include/mach/vmalloc.h

View file

2

arch/arm/mach-ep93xx/adssphere.c

View file

9

arch/arm/mach-ep93xx/edb93xx.c

View file

2

arch/arm/mach-ep93xx/gesbc9312.c

View file

42

arch/arm/mach-ep93xx/include/mach/entry-macro.S

View file

2

arch/arm/mach-ep93xx/include/mach/system.h

View file

5

arch/arm/mach-ep93xx/include/mach/vmalloc.h

View file

5

arch/arm/mach-ep93xx/micro9.c

View file

2

arch/arm/mach-ep93xx/simone.c

View file

2

arch/arm/mach-ep93xx/snappercl15.c

View file

2

arch/arm/mach-ep93xx/ts72xx.c

View file

20

arch/arm/mach-exynos/cpu.c

View file

75

arch/arm/mach-exynos/include/mach/entry-macro.S

View file

22

arch/arm/mach-exynos/include/mach/vmalloc.h

View file

2

arch/arm/mach-exynos/mach-armlex4210.c

View file

2

arch/arm/mach-exynos/mach-nuri.c

View file

2

arch/arm/mach-exynos/mach-origen.c

View file

3

arch/arm/mach-exynos/mach-smdk4x12.c

View file

3

arch/arm/mach-exynos/mach-smdkv310.c

View file

2

arch/arm/mach-exynos/mach-universal_c210.c

View file

28

arch/arm/mach-exynos/platsmp.c

View file

2

arch/arm/mach-footbridge/cats-hw.c

View file

2

arch/arm/mach-footbridge/include/mach/system.h

View file

10

arch/arm/mach-footbridge/include/mach/vmalloc.h

View file

10

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

View file

10

arch/arm/mach-h720x/include/mach/vmalloc.h

View file

1

arch/arm/mach-highbank/highbank.c

View file

2

arch/arm/mach-highbank/include/mach/entry-macro.S

View file

1

arch/arm/mach-highbank/include/mach/vmalloc.h

View file

20

arch/arm/mach-integrator/include/mach/vmalloc.h

View file

4

arch/arm/mach-iop13xx/include/mach/vmalloc.h

View file

7

arch/arm/mach-iop32x/include/mach/io.h

View file

4

arch/arm/mach-iop32x/include/mach/system.h

View file

5

arch/arm/mach-iop32x/include/mach/vmalloc.h

View file

7

arch/arm/mach-iop33x/include/mach/io.h

View file

2

arch/arm/mach-iop33x/include/mach/system.h

View file

5

arch/arm/mach-iop33x/include/mach/vmalloc.h

View file

2

arch/arm/mach-ixp2000/include/mach/system.h

View file

20

arch/arm/mach-ixp2000/include/mach/vmalloc.h

View file

29

arch/arm/mach-ixp23xx/include/mach/io.h

View file

10

arch/arm/mach-ixp23xx/include/mach/vmalloc.h

View file

2

arch/arm/mach-ixp4xx/include/mach/system.h

View file

5

arch/arm/mach-ixp4xx/include/mach/vmalloc.h

View file

25

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

View file

5

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

View file

2

arch/arm/mach-ks8695/include/mach/system.h

View file

19

arch/arm/mach-ks8695/include/mach/vmalloc.h

View file

3

arch/arm/mach-lpc32xx/include/mach/system.h

View file

24

arch/arm/mach-lpc32xx/include/mach/vmalloc.h

View file

4

arch/arm/mach-mmp/include/mach/system.h

View file

5

arch/arm/mach-mmp/include/mach/vmalloc.h

View file

2

arch/arm/mach-msm/board-msm8960.c

View file

4

arch/arm/mach-msm/board-msm8x60.c

View file

17

arch/arm/mach-msm/include/mach/entry-macro-qgic.S

View file

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