kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-11-13 07:31:07 +00:00
Code Issues Releases Packages Activity

Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into next/soc2

Browse source 
Conflicts:
	arch/arm/mach-tegra/common.c
	arch/arm/mach-ux500/devices-common.c

This resolves two conflicts and lets us merge the exynos5 branch
cleanly.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2012-03-15 21:05:52 +00:00
commit 38abdcd0d0
202 changed files with 931 additions and 2897 deletions
Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/Kconfig
View file

164
arch/arm/Kconfig.debug
View file

8
arch/arm/include/asm/hardware/entry-macro-iomd.S
View file

1
arch/arm/include/asm/system.h
View file

3
arch/arm/kernel/entry-armv.S
View file

8
arch/arm/kernel/entry-common.S
View file

27
arch/arm/kernel/process.c
View file

8
arch/arm/mach-at91/at91cap9.c
View file

10
arch/arm/mach-at91/at91rm9200.c
View file

8
arch/arm/mach-at91/at91sam9260.c
View file

8
arch/arm/mach-at91/at91sam9261.c
View file

8
arch/arm/mach-at91/at91sam9263.c
View file

7
arch/arm/mach-at91/at91sam9g45.c
View file

8
arch/arm/mach-at91/at91sam9rl.c
View file

12
arch/arm/mach-at91/at91x40.c
View file

6
arch/arm/mach-at91/include/mach/entry-macro.S
View file

50
arch/arm/mach-at91/include/mach/system.h
View file

23
arch/arm/mach-bcmring/core.c
View file

6
arch/arm/mach-bcmring/include/mach/entry-macro.S
View file

28
arch/arm/mach-bcmring/include/mach/system.h
View file

16
arch/arm/mach-clps711x/common.c
View file

6
arch/arm/mach-clps711x/include/mach/entry-macro.S
View file

35
arch/arm/mach-clps711x/include/mach/system.h
View file

15
arch/arm/mach-cns3xxx/include/mach/entry-macro.S
View file

25
arch/arm/mach-cns3xxx/include/mach/system.h
View file

6
arch/arm/mach-davinci/include/mach/entry-macro.S
View file

21
arch/arm/mach-davinci/include/mach/system.h
View file

6
arch/arm/mach-dove/include/mach/entry-macro.S
View file

17
arch/arm/mach-dove/include/mach/system.h
View file

25
arch/arm/mach-ebsa110/core.c
View file

6
arch/arm/mach-ebsa110/include/mach/entry-macro.S
View file

37
arch/arm/mach-ebsa110/include/mach/system.h
View file

46
arch/arm/mach-ep93xx/core.c
View file

17
arch/arm/mach-ep93xx/include/mach/entry-macro.S
View file

7
arch/arm/mach-ep93xx/include/mach/system.h
View file

12
arch/arm/mach-exynos/common.c
View file

38
arch/arm/mach-exynos/dma.c
View file

16
arch/arm/mach-exynos/include/mach/entry-macro.S
View file

20
arch/arm/mach-exynos/include/mach/system.h
View file

6
arch/arm/mach-footbridge/include/mach/entry-macro.S
View file

13
arch/arm/mach-footbridge/include/mach/system.h
View file

2
arch/arm/mach-gemini/Makefile
View file

29
arch/arm/mach-gemini/idle.c
View file

6
arch/arm/mach-gemini/include/mach/entry-macro.S
View file

14
arch/arm/mach-gemini/include/mach/system.h
View file

4
arch/arm/mach-gemini/irq.c
View file

18
arch/arm/mach-h720x/common.c
View file

6
arch/arm/mach-h720x/include/mach/entry-macro.S
View file

27
arch/arm/mach-h720x/include/mach/system.h
View file

5
arch/arm/mach-highbank/include/mach/entry-macro.S
View file

24
arch/arm/mach-highbank/include/mach/system.h
View file

52
arch/arm/mach-imx/mm-imx3.c
View file

28
arch/arm/mach-imx/mm-imx5.c
View file

3
arch/arm/mach-imx/pm-imx27.c
View file

70
arch/arm/mach-integrator/core.c
View file

9
arch/arm/mach-integrator/impd1.c
View file

6
arch/arm/mach-integrator/include/mach/entry-macro.S
View file

33
arch/arm/mach-integrator/include/mach/system.h
View file

49
arch/arm/mach-integrator/integrator_cp.c
View file

3
arch/arm/mach-iop13xx/include/mach/entry-macro.S
View file

13
arch/arm/mach-iop13xx/include/mach/system.h
View file

3
arch/arm/mach-iop32x/include/mach/entry-macro.S
View file

13
arch/arm/mach-iop32x/include/mach/system.h
View file

3
arch/arm/mach-iop33x/include/mach/entry-macro.S
View file

13
arch/arm/mach-iop33x/include/mach/system.h
View file

6
arch/arm/mach-ixp2000/include/mach/entry-macro.S
View file

14
arch/arm/mach-ixp2000/include/mach/system.h
View file

3
arch/arm/mach-ixp23xx/core.c
View file

6
arch/arm/mach-ixp23xx/include/mach/entry-macro.S
View file

16
arch/arm/mach-ixp23xx/include/mach/system.h
View file

6
arch/arm/mach-ixp4xx/common.c
View file

6
arch/arm/mach-ixp4xx/include/mach/entry-macro.S
View file

19
arch/arm/mach-ixp4xx/include/mach/system.h
View file

6
arch/arm/mach-kirkwood/include/mach/entry-macro.S
View file

17
arch/arm/mach-kirkwood/include/mach/system.h
View file

6
arch/arm/mach-ks8695/include/mach/entry-macro.S
View file

27
arch/arm/mach-ks8695/include/mach/system.h
View file

6
arch/arm/mach-lpc32xx/include/mach/entry-macro.S
View file

27
arch/arm/mach-lpc32xx/include/mach/system.h
View file

32
arch/arm/mach-lpc32xx/phy3250.c
View file

6
arch/arm/mach-mmp/include/mach/entry-macro.S
View file

16
arch/arm/mach-mmp/include/mach/system.h
View file

36
arch/arm/mach-msm/idle.S
View file

49
arch/arm/mach-msm/idle.c
View file

6
arch/arm/mach-msm/include/mach/entry-macro.S
View file

1
arch/arm/mach-msm/include/mach/system.h
View file

6
arch/arm/mach-mv78xx0/include/mach/entry-macro.S
View file

17
arch/arm/mach-mv78xx0/include/mach/system.h
View file

8
arch/arm/mach-mxs/devices.c
View file

2
arch/arm/mach-mxs/devices/amba-duart.c
View file

6
arch/arm/mach-mxs/include/mach/entry-macro.S
View file

25
arch/arm/mach-mxs/include/mach/system.h
View file

3
arch/arm/mach-mxs/pm.c
View file

13
arch/arm/mach-netx/fb.c
View file

26
arch/arm/mach-netx/include/mach/entry-macro.S
View file

28
arch/arm/mach-netx/include/mach/system.h
View file

17
arch/arm/mach-nomadik/board-nhk8815.c
View file

9
arch/arm/mach-nomadik/cpu-8815.c
View file

13
arch/arm/mach-nomadik/include/mach/entry-macro.S
View file

32
arch/arm/mach-nomadik/include/mach/system.h
View file

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