Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 into HEAD

Browse source

There are some more conflicts than detected by git, namely support for
the newly added cpuimx machines needed to be converted to dynamic device
registration.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Conflicts:
	arch/arm/mach-imx/Makefile
	arch/arm/mach-imx/devices.c
	arch/arm/mach-imx/devices.h
	arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
	arch/arm/mach-mx2/Kconfig
	arch/arm/mach-mx25/Makefile
	arch/arm/mach-mx25/devices.c
	arch/arm/plat-mxc/include/mach/mx25.h
	arch/arm/plat-mxc/include/mach/mxc_nand.h

...

This commit is contained in:

Uwe Kleine-König 2010-06-30 12:16:24 +02:00

parent 6b6322676a 5109a4597f

commit 2dcf78c0ee

1163 changed files with 52816 additions and 26460 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

3

arch/alpha/Kconfig

View file

19

arch/alpha/include/asm/scatterlist.h

View file

5

arch/alpha/math-emu/sfp-util.h

View file

4

arch/arm/Makefile

View file

99

arch/arm/configs/s3c2410_defconfig

View file

419

arch/arm/configs/s3c6400_defconfig

View file

29

arch/arm/configs/s5p6440_defconfig

View file

24

arch/arm/configs/s5p6442_defconfig

View file

235

arch/arm/configs/s5pc100_defconfig

View file

30

arch/arm/configs/s5pc110_defconfig

View file

33

arch/arm/configs/s5pv210_defconfig

View file

3

arch/arm/include/asm/scatterlist.h

View file

19

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

View file

3

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

View file

93

arch/arm/mach-mx2/Kconfig → arch/arm/mach-imx/Kconfig

View file

18

arch/arm/mach-mx2/Makefile → arch/arm/mach-imx/Makefile

View file

4

arch/arm/mach-mx2/Makefile.boot → arch/arm/mach-imx/Makefile.boot

View file

50

arch/arm/mach-mx1/clock.c → arch/arm/mach-imx/clock-imx1.c

View file

0

arch/arm/mach-mx2/clock_imx21.c → arch/arm/mach-imx/clock-imx21.c

View file

0

arch/arm/mach-mx2/clock_imx27.c → arch/arm/mach-imx/clock-imx27.c

View file

0

arch/arm/mach-mx2/cpu_imx27.c → arch/arm/mach-imx/cpu-imx27.c

View file

18

arch/arm/mach-imx/devices-imx1.h

View file

30

arch/arm/mach-imx/devices-imx21.h

View file

38

arch/arm/mach-imx/devices-imx27.h

View file

259

arch/arm/mach-mx2/devices.c → arch/arm/mach-imx/devices.c

View file

30

arch/arm/mach-mx2/devices.h → arch/arm/mach-imx/devices.h

View file

4

arch/arm/plat-mxc/dma-mx1-mx2.c → arch/arm/mach-imx/dma-v1.c

View file

24

arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c → arch/arm/mach-imx/eukrea_mbimx27-baseboard.c

View file

10

arch/arm/mach-imx/include/mach/dma-mx1-mx2.h

View file

10

arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h → arch/arm/mach-imx/include/mach/dma-v1.h

View file

25

arch/arm/mach-mx2/mach-cpuimx27.c → arch/arm/mach-imx/mach-cpuimx27.c

View file

11

arch/arm/mach-mx2/mach-imx27lite.c → arch/arm/mach-imx/mach-imx27lite.c

View file

34

arch/arm/mach-mx1/mach-mx1ads.c → arch/arm/mach-imx/mach-mx1ads.c

View file

58

arch/arm/mach-mx2/mach-mx21ads.c → arch/arm/mach-imx/mach-mx21ads.c

View file

17

arch/arm/mach-mx2/mach-mx27_3ds.c → arch/arm/mach-imx/mach-mx27_3ds.c

View file

76

arch/arm/mach-mx2/mach-mx27ads.c → arch/arm/mach-imx/mach-mx27ads.c

View file

36

arch/arm/mach-mx2/mach-mxt_td60.c → arch/arm/mach-imx/mach-mxt_td60.c

View file

23

arch/arm/mach-mx2/mach-pca100.c → arch/arm/mach-imx/mach-pca100.c

View file

33

arch/arm/mach-mx2/mach-pcm038.c → arch/arm/mach-imx/mach-pcm038.c

View file

21

arch/arm/mach-mx1/mach-scb9328.c → arch/arm/mach-imx/mach-scb9328.c

View file

23

arch/arm/mach-mx1/generic.c → arch/arm/mach-imx/mm-imx1.c

View file

5

arch/arm/mach-mx2/mm-imx21.c → arch/arm/mach-imx/mm-imx21.c

View file

5

arch/arm/mach-mx2/mm-imx27.c → arch/arm/mach-imx/mm-imx27.c

View file

0

arch/arm/mach-mx1/ksym_mx1.c → arch/arm/mach-imx/mx1-camera-fiq-ksym.c

View file

0

arch/arm/mach-mx1/mx1_camera_fiq.S → arch/arm/mach-imx/mx1-camera-fiq.S

View file

0

arch/arm/mach-mx2/pcm970-baseboard.c → arch/arm/mach-imx/pcm970-baseboard.c

View file

0

arch/arm/mach-mx2/pm-imx27.c → arch/arm/mach-imx/pm-imx27.c

View file

19

arch/arm/mach-mx1/Kconfig

View file

15

arch/arm/mach-mx1/Makefile

View file

4

arch/arm/mach-mx1/Makefile.boot

View file

55

arch/arm/mach-mx1/crm_regs.h

View file

242

arch/arm/mach-mx1/devices.c

View file

7

arch/arm/mach-mx1/devices.h

View file

141

arch/arm/mach-mx2/serial.c

View file

5

arch/arm/mach-mx25/Kconfig

View file

2

arch/arm/mach-mx25/Makefile

View file

38

arch/arm/mach-mx25/devices-imx25.h

View file

231

arch/arm/mach-mx25/devices.c

View file

12

arch/arm/mach-mx25/devices.h

View file

5

arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c

View file

21

arch/arm/mach-mx25/mach-cpuimx25.c

View file

21

arch/arm/mach-mx25/mach-mx25pdk.c → arch/arm/mach-mx25/mach-mx25_3ds.c

View file

7

arch/arm/mach-mx25/mm.c

View file

29

arch/arm/mach-mx3/Kconfig

View file

2

arch/arm/mach-mx3/Makefile

View file

38

arch/arm/mach-mx3/devices-imx31.h

View file

32

arch/arm/mach-mx3/devices-imx35.h

View file

247

arch/arm/mach-mx3/devices.c

View file

13

arch/arm/mach-mx3/devices.h

View file

5

arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c

View file

17

arch/arm/mach-mx3/mach-armadillo5x0.c

View file

17

arch/arm/mach-mx3/mach-cpuimx35.c

View file

31

arch/arm/mach-mx3/mach-kzm_arm11_01.c

View file

64

arch/arm/mach-mx3/mach-mx31_3ds.c

View file

55

arch/arm/mach-mx3/mach-mx31ads.c

View file

14

arch/arm/mach-mx3/mach-mx31lilly.c

View file

17

arch/arm/mach-mx3/mach-mx31lite.c

View file

95

arch/arm/mach-mx3/mach-mx31moboard.c

View file

16

arch/arm/mach-mx3/mach-mx35pdk.c → arch/arm/mach-mx3/mach-mx35_3ds.c

View file

31

arch/arm/mach-mx3/mach-pcm037.c

View file

7

arch/arm/mach-mx3/mach-pcm037_eet.c

View file

25

arch/arm/mach-mx3/mach-pcm043.c

View file

16

arch/arm/mach-mx3/mach-qong.c

View file

7

arch/arm/mach-mx3/mm.c

View file

14

arch/arm/mach-mx3/mx31lilly-db.c

View file

15

arch/arm/mach-mx3/mx31lite-db.c

View file

10

arch/arm/mach-mx3/mx31moboard-devboard.c

View file

4

arch/arm/mach-mx3/mx31moboard-marxbot.c

View file

11

arch/arm/mach-mx3/mx31moboard-smartbot.c

View file

2

arch/arm/mach-mx5/devices.c

View file

3

arch/arm/mach-mx5/mm.c

View file

5

arch/arm/mach-mxc91231/crm_regs.h

View file

2

arch/arm/mach-mxc91231/devices.c

View file

8

arch/arm/mach-mxc91231/mm.c

View file

4

arch/arm/mach-omap2/board-3430sdp.c

View file

3

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

View file

4

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

View file

4

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

View file

3

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

View file

22

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

View file

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