Merge remote-tracking branch 'asoc/fix/pxa' into asoc-pxa

Browse source

...

This commit is contained in:

Mark Brown 2013-01-08 11:29:45 +00:00

parent 01a61f490c 3b4bc7bccc

commit 07afa01813

204 changed files with 1963 additions and 1295 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

10

Documentation/devicetree/bindings/watchdog/twl4030-wdt.txt

View file

9

MAINTAINERS

View file

2

Makefile

View file

4

arch/arm/boot/dts/twl4030.dtsi

View file

1

arch/arm/configs/multi_v7_defconfig

View file

5

arch/arm/configs/omap2plus_defconfig

View file

2

arch/arm/mach-omap1/Makefile

View file

80

arch/arm/mach-omap1/fb.c

View file

2

arch/arm/mach-omap2/Makefile

View file

2

arch/arm/mach-omap2/control.h

View file

3

arch/arm/mach-omap2/dpll3xxx.c

View file

1

arch/arm/mach-omap2/drm.c

View file

3

arch/arm/mach-omap2/dss-common.c

View file

50

arch/arm/plat-omap/fb.c → arch/arm/mach-omap2/fb.c

View file

1

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

View file

8

arch/arm/mach-omap2/omap_twl.c

View file

2

arch/arm/mach-omap2/pmu.c

View file

3

arch/arm/mach-omap2/prm2xxx.c

View file

3

arch/arm/mach-omap2/prm3xxx.c

View file

3

arch/arm/mach-pxa/include/mach/mfp-pxa27x.h

View file

4

arch/arm/mach-pxa/pxa27x.c

View file

4

arch/arm/mach-sunxi/sunxi.c

View file

2

arch/arm/plat-omap/Makefile

View file

13

arch/arm/plat-omap/dmtimer.c

View file

4

arch/arm/plat-omap/include/plat/cpu.h

View file

3

arch/x86/pci/common.c

View file

2

drivers/atm/solos-pci.c

View file

49

drivers/gpu/drm/drm_mm.c

View file

3

drivers/gpu/drm/i915/i915_dma.c

View file

8

drivers/gpu/drm/i915/i915_drv.h

View file

79

drivers/gpu/drm/i915/i915_gem.c

View file

2

drivers/gpu/drm/i915/i915_gem_dmabuf.c

View file

2

drivers/gpu/drm/i915/i915_gem_execbuffer.c

View file

12

drivers/gpu/drm/i915/i915_irq.c

View file

4

drivers/gpu/drm/i915/i915_reg.h

View file

23

drivers/gpu/drm/i915/intel_display.c

View file

182

drivers/gpu/drm/i915/intel_pm.c

View file

76

drivers/gpu/drm/i915/intel_ringbuffer.c

View file

1

drivers/gpu/drm/i915/intel_ringbuffer.h

View file

5

drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnve0.fuc

View file

17

drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnve0.fuc.h

View file

10

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc

View file

147

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h

View file

13

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnve0.fuc

View file

157

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnve0.fuc.h

View file

11

drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c

View file

1

drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h

View file

3

drivers/gpu/drm/nouveau/core/engine/graph/nve0.c

View file

1

drivers/gpu/drm/nouveau/core/include/subdev/bios.h

View file

8

drivers/gpu/drm/nouveau/core/include/subdev/bios/gpio.h

View file

1

drivers/gpu/drm/nouveau/core/include/subdev/bios/init.h

View file

2

drivers/gpu/drm/nouveau/core/include/subdev/gpio.h

View file

5

drivers/gpu/drm/nouveau/core/subdev/bios/base.c

View file

134

drivers/gpu/drm/nouveau/core/subdev/bios/gpio.c

View file

65

drivers/gpu/drm/nouveau/core/subdev/bios/init.c

View file

28

drivers/gpu/drm/nouveau/core/subdev/device/nve0.c

View file

9

drivers/gpu/drm/nouveau/core/subdev/gpio/base.c

View file

9

drivers/gpu/drm/nouveau/core/subdev/gpio/nv50.c

View file

9

drivers/gpu/drm/nouveau/core/subdev/gpio/nvd0.c

View file

2

drivers/gpu/drm/nouveau/core/subdev/mxm/base.c

View file

30

drivers/gpu/drm/radeon/evergreen_cs.c

View file

29

drivers/gpu/drm/radeon/r600_cs.c

View file

3

drivers/gpu/drm/radeon/radeon.h

View file

17

drivers/gpu/drm/radeon/radeon_device.c

View file

3

drivers/gpu/drm/radeon/radeon_drv.c

View file

49

drivers/gpu/drm/radeon/radeon_fence.c

View file

15

drivers/gpu/drm/radeon/radeon_pm.c

View file

11

drivers/gpu/drm/tegra/dc.c

View file

18

drivers/gpu/drm/tegra/drm.h

View file

25

drivers/gpu/drm/tegra/hdmi.c

View file

2

drivers/gpu/drm/tegra/host1x.c

View file

2

drivers/hwmon/emc6w201.c

View file

16

drivers/hwmon/lm73.c

View file

8

drivers/i2c/busses/i2c-ali1535.c

View file

10

drivers/i2c/busses/i2c-ali1563.c

View file

8

drivers/i2c/busses/i2c-ali15x3.c

View file

7

drivers/i2c/busses/i2c-amd756.c

View file

7

drivers/i2c/busses/i2c-amd8111.c

View file

14

drivers/i2c/busses/i2c-at91.c

View file

6

drivers/i2c/busses/i2c-au1550.c

View file

8

drivers/i2c/busses/i2c-cpm.c

View file

6

drivers/i2c/busses/i2c-designware-pcidrv.c

View file

6

drivers/i2c/busses/i2c-designware-platdrv.c

View file

6

drivers/i2c/busses/i2c-eg20t.c

View file

8

drivers/i2c/busses/i2c-elektor.c

View file

8

drivers/i2c/busses/i2c-gpio.c

View file

6

drivers/i2c/busses/i2c-highlander.c

View file

6

drivers/i2c/busses/i2c-hydra.c

View file

28

drivers/i2c/busses/i2c-i801.c

View file

8

drivers/i2c/busses/i2c-ibm_iic.c

View file

6

drivers/i2c/busses/i2c-intel-mid.c

View file

6

drivers/i2c/busses/i2c-isch.c

View file

38

drivers/i2c/busses/i2c-mpc.c

View file

18

drivers/i2c/busses/i2c-mv64xxx.c

View file

6

drivers/i2c/busses/i2c-mxs.c

View file

12

drivers/i2c/busses/i2c-nforce2.c

View file

6

drivers/i2c/busses/i2c-nuc900.c

View file

6

drivers/i2c/busses/i2c-ocores.c

View file

10

drivers/i2c/busses/i2c-octeon.c

View file

6

drivers/i2c/busses/i2c-omap.c

View file

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