Merge branch 'linus' into x86/boot

Browse source

Merge this into x86/boot so that we can queue up dependent patches.

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

...

This commit is contained in:

Ingo Molnar 2012-02-07 11:33:48 +01:00

parent 35f1790e6c 23783f817b

commit 7915a2e902

779 changed files with 26039 additions and 29618 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

17

Documentation/DocBook/device-drivers.tmpl

View file

2

Documentation/DocBook/deviceiobook.tmpl

View file

4

Documentation/driver-model/devres.txt

View file

14

Documentation/feature-removal-schedule.txt

View file

72

Documentation/input/event-codes.txt

View file

17

Documentation/pinctrl.txt

View file

2

Documentation/power/basic-pm-debugging.txt

View file

8

Documentation/power/freezing-of-tasks.txt

View file

3

Documentation/stable_kernel_rules.txt

View file

2

Documentation/thermal/sysfs-api.txt

View file

2

Documentation/virtual/00-INDEX

View file

75

MAINTAINERS

View file

2

Makefile

View file

4

arch/arm/Kconfig

View file

1

arch/arm/Makefile

View file

7

arch/arm/common/gic.c

View file

61

arch/arm/configs/mx5_defconfig → arch/arm/configs/imx_v6_v7_defconfig

View file

144

arch/arm/configs/mx3_defconfig

View file

4

arch/arm/include/asm/assembler.h

View file

8

arch/arm/include/asm/domain.h

View file

8

arch/arm/include/asm/futex.h

View file

6

arch/arm/include/asm/smp.h

View file

6

arch/arm/include/asm/smp_plat.h

View file

10

arch/arm/include/asm/tlb.h

View file

16

arch/arm/include/asm/uaccess.h

View file

2

arch/arm/kernel/entry-armv.S

View file

15

arch/arm/kernel/entry-common.S

View file

28

arch/arm/kernel/perf_event_v7.c

View file

8

arch/arm/kernel/ptrace.c

View file

17

arch/arm/kernel/setup.c

View file

5

arch/arm/kernel/signal.c

View file

24

arch/arm/kernel/smp.c

View file

2

arch/arm/kernel/smp_twd.c

View file

9

arch/arm/kernel/vmlinux.lds.S

View file

12

arch/arm/lib/getuser.S

View file

28

arch/arm/lib/putuser.S

View file

82

arch/arm/lib/uaccess.S

View file

14

arch/arm/mach-at91/Kconfig

View file

14

arch/arm/mach-at91/Makefile

View file

9

arch/arm/mach-at91/at91cap9.c

View file

1

arch/arm/mach-at91/at91sam9260.c

View file

1

arch/arm/mach-at91/at91sam9261.c

View file

1

arch/arm/mach-at91/at91sam9263.c

View file

7

arch/arm/mach-at91/at91sam9_alt_reset.S

View file

7

arch/arm/mach-at91/at91sam9g45.c

View file

40

arch/arm/mach-at91/at91sam9g45_reset.S

View file

1

arch/arm/mach-at91/at91sam9rl.c

View file

2

arch/arm/mach-at91/generic.h

View file

18

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

View file

2

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

View file

108

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

View file

2

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

View file

2

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

View file

2

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

View file

30

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

View file

2

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

View file

2

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

View file

2

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

View file

9

arch/arm/mach-at91/pm.c

View file

8

arch/arm/mach-at91/pm.h

View file

5

arch/arm/mach-at91/pm_slowclock.S

View file

16

arch/arm/mach-at91/setup.c

View file

2

arch/arm/mach-bcmring/arch.c

View file

812

arch/arm/mach-bcmring/dma.c

View file

196

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

View file

2

arch/arm/mach-davinci/board-da850-evm.c

View file

2

arch/arm/mach-davinci/board-dm365-evm.c

View file

2

arch/arm/mach-davinci/board-dm644x-evm.c

View file

2

arch/arm/mach-davinci/board-dm646x-evm.c

View file

2

arch/arm/mach-davinci/board-neuros-osd2.c

View file

2

arch/arm/mach-davinci/board-omapl138-hawk.c

View file

2

arch/arm/mach-davinci/board-sffsdr.c

View file

32

arch/arm/mach-davinci/da850.c

View file

1

arch/arm/mach-exynos/hotplug.c

View file

1

arch/arm/mach-exynos/platsmp.c

View file

3

arch/arm/mach-highbank/highbank.c

View file

238

arch/arm/mach-imx/Kconfig

View file

21

arch/arm/mach-imx/Makefile

View file

12

arch/arm/mach-imx/Makefile.boot

View file

11

arch/arm/mach-imx/clock-imx6q.c

View file

2

arch/arm/mach-mx5/clock-mx51-mx53.c → arch/arm/mach-imx/clock-mx51-mx53.c

View file

0

arch/arm/mach-mx5/cpu.c → arch/arm/mach-imx/cpu-imx5.c

View file

0

arch/arm/mach-mx5/cpu_op-mx51.c → arch/arm/mach-imx/cpu_op-mx51.c

View file

0

arch/arm/mach-mx5/cpu_op-mx51.h → arch/arm/mach-imx/cpu_op-mx51.h

View file

0

arch/arm/mach-mx5/crm_regs.h → arch/arm/mach-imx/crm-regs-imx5.h

View file

0

arch/arm/mach-mx5/devices-imx50.h → arch/arm/mach-imx/devices-imx50.h

View file

0

arch/arm/mach-mx5/devices-imx51.h → arch/arm/mach-imx/devices-imx51.h

View file

0

arch/arm/mach-mx5/devices-imx53.h → arch/arm/mach-imx/devices-imx53.h

View file

0

arch/arm/mach-mx5/efika.h → arch/arm/mach-imx/efika.h

View file

0

arch/arm/mach-mx5/ehci.c → arch/arm/mach-imx/ehci-imx5.c

View file

0

arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c → arch/arm/mach-imx/eukrea_mbimx51-baseboard.c

View file

0

arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c → arch/arm/mach-imx/eukrea_mbimxsd-baseboard.c

View file

0

arch/arm/mach-mx5/imx51-dt.c → arch/arm/mach-imx/imx51-dt.c

View file

0

arch/arm/mach-mx5/imx53-dt.c → arch/arm/mach-imx/imx53-dt.c

View file

0

arch/arm/mach-mx5/board-cpuimx51.c → arch/arm/mach-imx/mach-cpuimx51.c

View file

0

arch/arm/mach-mx5/board-cpuimx51sd.c → arch/arm/mach-imx/mach-cpuimx51sd.c

View file

0

arch/arm/mach-mx5/board-mx50_rdp.c → arch/arm/mach-imx/mach-mx50_rdp.c

View file

0

arch/arm/mach-mx5/board-mx51_3ds.c → arch/arm/mach-imx/mach-mx51_3ds.c

View file

0

arch/arm/mach-mx5/board-mx51_babbage.c → arch/arm/mach-imx/mach-mx51_babbage.c

View file

0

arch/arm/mach-mx5/board-mx51_efikamx.c → arch/arm/mach-imx/mach-mx51_efikamx.c

View file

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