Merge commit 'v2.6.38-rc4' into imx-for-2.6.39

Browse source

Conflicts:
	arch/arm/mach-mxs/clock-mx28.c

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

...

This commit is contained in:

Sascha Hauer 2011-02-11 08:32:18 +01:00

parent 23b120cdfa 100b33c8bd

commit f19693a17c

1821 changed files with 129518 additions and 120562 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

1

.mailmap

View file

25

Documentation/ABI/testing/sysfs-platform-at91

View file

4

Documentation/DocBook/device-drivers.tmpl

View file

2

Documentation/DocBook/dvb/dvbapi.xml

View file

4

Documentation/DocBook/media.tmpl

View file

6

Documentation/DocBook/v4l/dev-rds.xml

View file

3

Documentation/DocBook/v4l/v4l2.xml

View file

24

Documentation/feature-removal-schedule.txt

View file

2

Documentation/filesystems/ntfs.txt

View file

7

Documentation/hwmon/lm93

View file

4

Documentation/kernel-parameters.txt

View file

73

Documentation/lguest/lguest.c

View file

5

Documentation/lguest/lguest.txt

View file

83

Documentation/networking/bonding.txt

View file

2

Documentation/networking/ip-sysctl.txt

View file

33

Documentation/scheduler/sched-stats.txt

View file

1

Documentation/sound/alsa/HD-Audio-Models.txt

View file

45

Documentation/sound/alsa/soc/codec.txt

View file

38

Documentation/sound/alsa/soc/machine.txt

View file

12

Documentation/sound/alsa/soc/platform.txt

View file

12

Documentation/video4linux/v4l2-controls.txt

View file

128

MAINTAINERS

View file

4

Makefile

View file

19

arch/alpha/Kconfig

View file

2

arch/arm/configs/ag5evm_defconfig

View file

2

arch/arm/configs/am200epdkit_defconfig

View file

2

arch/arm/configs/at572d940hfek_defconfig

View file

2

arch/arm/configs/badge4_defconfig

View file

2

arch/arm/configs/bcmring_defconfig

View file

2

arch/arm/configs/cm_x2xx_defconfig

View file

2

arch/arm/configs/colibri_pxa270_defconfig

View file

2

arch/arm/configs/collie_defconfig

View file

2

arch/arm/configs/corgi_defconfig

View file

2

arch/arm/configs/da8xx_omapl_defconfig

View file

2

arch/arm/configs/davinci_all_defconfig

View file

2

arch/arm/configs/dove_defconfig

View file

2

arch/arm/configs/ebsa110_defconfig

View file

2

arch/arm/configs/edb7211_defconfig

View file

2

arch/arm/configs/em_x270_defconfig

View file

2

arch/arm/configs/ep93xx_defconfig

View file

2

arch/arm/configs/eseries_pxa_defconfig

View file

2

arch/arm/configs/ezx_defconfig

View file

2

arch/arm/configs/footbridge_defconfig

View file

2

arch/arm/configs/fortunet_defconfig

View file

2

arch/arm/configs/h5000_defconfig

View file

2

arch/arm/configs/imote2_defconfig

View file

2

arch/arm/configs/ixp2000_defconfig

View file

2

arch/arm/configs/ixp23xx_defconfig

View file

2

arch/arm/configs/ixp4xx_defconfig

View file

2

arch/arm/configs/loki_defconfig

View file

2

arch/arm/configs/lpd7a400_defconfig

View file

2

arch/arm/configs/lpd7a404_defconfig

View file

2

arch/arm/configs/magician_defconfig

View file

2

arch/arm/configs/mv78xx0_defconfig

View file

2

arch/arm/configs/mx1_defconfig

View file

2

arch/arm/configs/mx21_defconfig

View file

2

arch/arm/configs/mx27_defconfig

View file

2

arch/arm/configs/mx3_defconfig

View file

2

arch/arm/configs/mx51_defconfig

View file

2

arch/arm/configs/nhk8815_defconfig

View file

2

arch/arm/configs/omap1_defconfig

View file

2

arch/arm/configs/omap2plus_defconfig

View file

2

arch/arm/configs/orion5x_defconfig

View file

2

arch/arm/configs/pcm027_defconfig

View file

2

arch/arm/configs/pcontrol_g20_defconfig

View file

2

arch/arm/configs/pleb_defconfig

View file

2

arch/arm/configs/pnx4008_defconfig

View file

2

arch/arm/configs/simpad_defconfig

View file

2

arch/arm/configs/spitz_defconfig

View file

2

arch/arm/configs/stmp378x_defconfig

View file

2

arch/arm/configs/stmp37xx_defconfig

View file

2

arch/arm/configs/tct_hammer_defconfig

View file

2

arch/arm/configs/trizeps4_defconfig

View file

2

arch/arm/configs/u300_defconfig

View file

2

arch/arm/configs/viper_defconfig

View file

2

arch/arm/configs/xcep_defconfig

View file

6

arch/arm/include/asm/hardware/sp810.h

View file

33

arch/arm/include/asm/io.h

View file

2

arch/arm/include/asm/memory.h

View file

22

arch/arm/kernel/head.S

View file

7

arch/arm/kernel/smp_twd.c

View file

2

arch/arm/mach-ep93xx/core.c

View file

7

arch/arm/mach-ep93xx/gpio.c

View file

4

arch/arm/mach-footbridge/include/mach/debug-macro.S

View file

2

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

View file

4

arch/arm/mach-ixp4xx/common.c

View file

5

arch/arm/mach-ixp4xx/include/mach/timex.h

View file

9

arch/arm/mach-ixp4xx/ixp4xx_qmgr.c

View file

4

arch/arm/mach-msm/board-qsd8x50.c

View file

4

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

View file

7

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

View file

2

arch/arm/mach-mxs/clock.c

View file

2

arch/arm/mach-mxs/gpio.c

View file

2

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

View file

2

arch/arm/mach-omap1/Kconfig

View file

3

arch/arm/mach-omap1/Makefile

View file

13

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

View file

2

arch/arm/mach-omap1/irq.c

View file

24

arch/arm/mach-omap1/lcd_dma.c

View file

100

arch/arm/mach-omap1/time.c

View file

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