Merge branches 'sirf/devel', 'at91/devel', 'imx/devel' and 'davinci/devel' into next/devel

Browse source

...

This commit is contained in:

Arnd Bergmann 2011-10-07 21:59:57 +02:00

parent 684f741446 1fcaea7e4c 526b264163 ab3f5c1fc2

commit 112d17d6f7

265 changed files with 5387 additions and 6196 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

38

Documentation/DocBook/media/v4l/controls.xml

View file

7

Documentation/hwmon/max16065

View file

2

Documentation/ioctl/ioctl-number.txt

View file

2

Makefile

View file

1

arch/arm/Kconfig

View file

4

arch/arm/Makefile

View file

68

arch/arm/configs/mx27_defconfig → arch/arm/configs/imx_v4_v5_defconfig

View file

91

arch/arm/configs/mx1_defconfig

View file

97

arch/arm/configs/mx21_defconfig

View file

60

arch/arm/configs/mx51_defconfig → arch/arm/configs/mx5_defconfig

View file

9

arch/arm/include/asm/hardware/cache-l2x0.h

View file

2

arch/arm/mach-at91/at91cap9.c

View file

6

arch/arm/mach-at91/at91cap9_devices.c

View file

2

arch/arm/mach-at91/at91rm9200.c

View file

8

arch/arm/mach-at91/at91rm9200_devices.c

View file

2

arch/arm/mach-at91/at91sam9260.c

View file

8

arch/arm/mach-at91/at91sam9260_devices.c

View file

29

arch/arm/mach-at91/at91sam9261.c

View file

8

arch/arm/mach-at91/at91sam9261_devices.c

View file

2

arch/arm/mach-at91/at91sam9263.c

View file

6

arch/arm/mach-at91/at91sam9263_devices.c

View file

2

arch/arm/mach-at91/at91sam9g45.c

View file

6

arch/arm/mach-at91/at91sam9g45_devices.c

View file

5

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

View file

1

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

View file

1

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

View file

1

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

View file

2

arch/arm/mach-cns3xxx/pcie.c

View file

10

arch/arm/mach-davinci/Kconfig

View file

142

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

View file

9

arch/arm/mach-davinci/da850.c

View file

3

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

View file

10

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

View file

2

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

View file

6

arch/arm/mach-davinci/sleep.S

View file

52

arch/arm/mach-imx/Kconfig

View file

15

arch/arm/mach-imx/Makefile

View file

56

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

View file

6

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

View file

6

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

View file

8

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

View file

7

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

View file

41

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

View file

28

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

View file

51

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

View file

32

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

View file

4

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

View file

4

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

View file

4

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

View file

1

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

View file

19

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

View file

1

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

View file

1

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

View file

3

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

View file

1

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

View file

1

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

View file

1

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

View file

1

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

View file

1

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

View file

17

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

View file

1

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

View file

11

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

View file

3

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

View file

1

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

View file

1

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

View file

1

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

View file

1

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

View file

1

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

View file

18

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

View file

1

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

1

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

View file

1

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

View file

1

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

View file

2

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

View file

1

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

View file

3

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

View file

256

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

View file

91

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

View file

109

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

View file

2

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

View file

6

arch/arm/mach-integrator/integrator_ap.c

View file

29

arch/arm/mach-mx5/Kconfig

View file

3

arch/arm/mach-mx5/Makefile

View file

28

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

View file

26

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

View file

1

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

View file

2

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

View file

27

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

View file

14

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

View file

25

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

View file

5

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

View file

1

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

View file

21

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

View file

1

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

View file

14

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

View file

74

arch/arm/mach-mx5/cpu.c

View file

17

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

View file

4

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

View file

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