Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

Browse source

...

This commit is contained in:

Russell King 2011-05-20 10:38:27 +01:00

parent 1e87347c2f 27ad4bf72a

commit c721be2807

157 changed files with 10394 additions and 12406 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/arm/Makefile

View file

1

arch/arm/configs/mx1_defconfig

View file

2

arch/arm/configs/mx51_defconfig

View file

286

arch/arm/mach-imx/Kconfig

View file

40

arch/arm/mach-imx/Makefile

View file

4

arch/arm/mach-imx/Makefile.boot

View file

56

arch/arm/mach-imx/cache-l2x0.c

View file

3

arch/arm/mach-mx3/clock-imx31.c → arch/arm/mach-imx/clock-imx31.c

View file

1

arch/arm/mach-mx3/clock-imx35.c → arch/arm/mach-imx/clock-imx35.c

View file

38

arch/arm/mach-mx3/cpu.c → arch/arm/mach-imx/cpu-imx31.c

View file

44

arch/arm/mach-imx/cpu-imx35.c

View file

0

arch/arm/mach-mx3/crm_regs.h → arch/arm/mach-imx/crmregs-imx31.h

View file

8

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

View file

22

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

View file

35

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

View file

30

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

View file

36

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

View file

37

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

View file

1

arch/arm/mach-mx3/ehci-imx31.c → arch/arm/mach-imx/ehci-imx31.c

View file

1

arch/arm/mach-mx3/ehci-imx35.c → arch/arm/mach-imx/ehci-imx35.c

View file

1

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

View file

17

arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c

View file

29

arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c → arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c

View file

0

arch/arm/mach-mx3/iomux-imx31.c → arch/arm/mach-imx/iomux-imx31.c

View file

144

arch/arm/mach-imx/mach-apf9328.c

View file

29

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

View file

1

arch/arm/mach-mx3/mach-bug.c → arch/arm/mach-imx/mach-bug.c

View file

1

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

View file

2

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

View file

2

arch/arm/mach-imx/mach-eukrea_cpuimx25.c

View file

14

arch/arm/mach-imx/mach-imx27_visstrim_m10.c

View file

1

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

View file

1

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

View file

1

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

View file

13

arch/arm/mach-imx/mach-mx25_3ds.c

View file

1

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

View file

50

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

View file

1

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

View file

1

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

View file

1

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

View file

75

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

View file

1

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

View file

1

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

View file

1

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

View file

65

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

View file

17

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

View file

1

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

View file

17

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

View file

15

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

View file

25

arch/arm/mach-mx3/mach-vpr200.c → arch/arm/mach-imx/mach-vpr200.c

View file

66

arch/arm/mach-imx/mm-imx31.c

View file

63

arch/arm/mach-imx/mm-imx35.c

View file

13

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

View file

3

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

View file

1

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

View file

2

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

View file

1

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

View file

0

arch/arm/mach-mx3/pcm037.h → arch/arm/mach-imx/pcm037.h

View file

257

arch/arm/mach-mx3/Kconfig

View file

26

arch/arm/mach-mx3/Makefile

View file

3

arch/arm/mach-mx3/Makefile.boot

View file

115

arch/arm/mach-mx3/devices.c

View file

4

arch/arm/mach-mx3/devices.h

View file

141

arch/arm/mach-mx3/mm.c

View file

58

arch/arm/mach-mx5/Kconfig

View file

2

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

View file

2

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

View file

1

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

View file

18

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

View file

5

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

View file

5

arch/arm/mach-mx5/board-mx51_efikasb.c

View file

2

arch/arm/mach-mx5/board-mx53_evk.c

View file

2

arch/arm/mach-mx5/board-mx53_loco.c

View file

30

arch/arm/mach-mx5/board-mx53_smd.c

View file

1

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

View file

23

arch/arm/mach-mx5/cpu.c

View file

6

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

View file

25

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

View file

13

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

View file

2

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

View file

16

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

View file

3

arch/arm/mach-mx5/mx51_efika.c

View file

11

arch/arm/mach-mxc91231/Kconfig

View file

2

arch/arm/mach-mxc91231/Makefile

View file

3

arch/arm/mach-mxc91231/Makefile.boot

View file

640

arch/arm/mach-mxc91231/clock.c

View file

394

arch/arm/mach-mxc91231/crm_regs.h

View file

251

arch/arm/mach-mxc91231/devices.c

View file

13

arch/arm/mach-mxc91231/devices.h

View file

177

arch/arm/mach-mxc91231/iomux.c

View file

62

arch/arm/mach-mxc91231/magx-zn5.c

View file

62

arch/arm/mach-mxc91231/mm.c

View file

51

arch/arm/mach-mxc91231/system.c

View file

2

arch/arm/mach-mxs/Kconfig

View file

2

arch/arm/mach-mxs/clock-mx23.c

View file

2

arch/arm/mach-mxs/devices-mx28.h

View file

5

arch/arm/mach-mxs/devices/platform-mxs-i2c.c

View file

5

arch/arm/mach-mxs/include/mach/devices-common.h

View file

2

arch/arm/mach-mxs/include/mach/mx23.h

View file

2

arch/arm/mach-mxs/mach-mx23evk.c

View file

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