Linux 3.5-rc4

Browse source

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJP53AxAAoJEHm+PkMAQRiGs2QH/RaqkXz96fwjhDcyiKpDqA3c
 kGuS5mz5cOhnqKSmR88HFm6pwuhLux/qSJzeAmoQy1MC8a0ACx7AnANW0lfN3/qe
 /HGYz8h60yCL/fhn8/bUYtdt9xsoDqoDcq/ooFl9mcsJGWbC6WeMSZU5dAUYqviE
 qFrp5zjY07FG53CRGT0hFpezQNwNL+VLH30CF9LD+fJLPVEYum2zBNGXWM42rcw5
 fxzGL/6SO8YqA/Upic1ht6HAd6s5LOrlST7qvnyXUMvRXN5z/Y92ueYJZefkS1Om
 ohuLIKM2bv9/dJS67H8N2baSKGCzBdfSe5/5WaHdLYW9MiVju0wRl6HPJtAMrkk=
 =H8t8
 -----END PGP SIGNATURE-----

Merge tag 'v3.5-rc4' into drm-intel-next-queued

I want to merge the "no more fake agp on gen6+" patches into
drm-intel-next (well, the last pieces). But a patch in 3.5-rc4 also
adds a new use of dev->agp. Hence the backmarge to sort this out, for
otherwise drm-intel-next merged into Linus' tree would conflict in the
relevant code, things would compile but nicely OOPS at driver load :(

Conflicts in this merge are just simple cases of "both branches
changed/added lines at the same place". The only tricky part is to
keep the order correct wrt the unwind code in case of errors in
intel_ringbuffer.c (and the MI_DISPLAY_FLIP #defines in i915_reg.h
together, obviously).

Conflicts:
	drivers/gpu/drm/i915/i915_reg.h
	drivers/gpu/drm/i915/intel_ringbuffer.c

Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

...

This commit is contained in:

Daniel Vetter 2012-06-25 19:06:12 +02:00

parent 9756fe38d1 6b16351acb

commit 7b0cfee1a2

1660 changed files with 53943 additions and 17792 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

2

drivers/acpi/Kconfig

View file

10

drivers/acpi/battery.c

View file

88

drivers/acpi/bus.c

View file

2

drivers/acpi/power.c

View file

30

drivers/acpi/processor_perflib.c

View file

1

drivers/acpi/scan.c

View file

57

drivers/acpi/sleep.c

View file

33

drivers/acpi/video.c

View file

4

drivers/ata/pata_arasan_cf.c

View file

4

drivers/atm/solos-pci.c

View file

2

drivers/base/dd.c

View file

10

drivers/base/regmap/regmap.c

View file

2

drivers/base/soc.c

View file

4

drivers/bcma/driver_chipcommon_pmu.c

View file

6

drivers/bcma/driver_pci.c

View file

4

drivers/bcma/sprom.c

View file

282

drivers/block/mtip32xx/mtip32xx.c

View file

44

drivers/block/mtip32xx/mtip32xx.h

View file

1

drivers/char/agp/intel-agp.c

View file

1

drivers/char/agp/intel-agp.h

View file

9

drivers/char/hw_random/atmel-rng.c

View file

2

drivers/clk/spear/clk-aux-synth.c

View file

2

drivers/clk/spear/clk-frac-synth.c

View file

2

drivers/clk/spear/clk-gpt-synth.c

View file

2

drivers/clk/spear/clk-vco-pll.c

View file

2

drivers/clk/spear/clk.c

View file

2

drivers/clk/spear/clk.h

View file

2

drivers/clk/spear/spear1310_clock.c

View file

2

drivers/clk/spear/spear1340_clock.c

View file

2

drivers/clk/spear/spear3xx_clock.c

View file

2

drivers/clk/spear/spear6xx_clock.c

View file

1

drivers/clocksource/Makefile

View file

406

drivers/clocksource/em_sti.c

View file

26

drivers/clocksource/sh_cmt.c

View file

6

drivers/clocksource/sh_mtu2.c

View file

16

drivers/clocksource/sh_tmu.c

View file

2

drivers/dma/dw_dmac.c

View file

6

drivers/dma/imx-sdma.c

View file

30

drivers/dma/pl330.c

View file

2

drivers/edac/edac_mc.c

View file

15

drivers/edac/i7core_edac.c

View file

2

drivers/edac/mce_amd.h

View file

3

drivers/edac/mpc85xx_edac.c

View file

10

drivers/edac/sb_edac.c

View file

5

drivers/extcon/extcon-max8997.c

View file

2

drivers/extcon/extcon_class.c

View file

2

drivers/extcon/extcon_gpio.c

View file

2

drivers/gpio/gpio-samsung.c

View file

19

drivers/gpu/drm/cirrus/cirrus_drv.c

View file

2

drivers/gpu/drm/cirrus/cirrus_drv.h

View file

5

drivers/gpu/drm/cirrus/cirrus_ttm.c

View file

13

drivers/gpu/drm/drm_edid.c

View file

4

drivers/gpu/drm/exynos/exynos_drm_drv.c

View file

7

drivers/gpu/drm/exynos/exynos_drm_encoder.c

View file

19

drivers/gpu/drm/exynos/exynos_drm_fb.c

View file

4

drivers/gpu/drm/exynos/exynos_drm_fb.h

View file

9

drivers/gpu/drm/exynos/exynos_drm_gem.c

View file

12

drivers/gpu/drm/exynos/exynos_mixer.c

View file

4

drivers/gpu/drm/i810/i810_dma.c

View file

13

drivers/gpu/drm/i915/i915_drv.c

View file

3

drivers/gpu/drm/i915/i915_drv.h

View file

38

drivers/gpu/drm/i915/i915_irq.c

View file

43

drivers/gpu/drm/i915/i915_reg.h

View file

21

drivers/gpu/drm/i915/intel_display.c

View file

60

drivers/gpu/drm/i915/intel_dp.c

View file

21

drivers/gpu/drm/i915/intel_ringbuffer.c

View file

19

drivers/gpu/drm/mgag200/mgag200_drv.c

View file

10

drivers/gpu/drm/radeon/atombios_crtc.c

View file

4

drivers/gpu/drm/radeon/atombios_encoders.c

View file

389

drivers/gpu/drm/radeon/evergreen.c

View file

49

drivers/gpu/drm/radeon/evergreen_cs.c

View file

3

drivers/gpu/drm/radeon/evergreen_hdmi.c

View file

12

drivers/gpu/drm/radeon/evergreend.h

View file

386

drivers/gpu/drm/radeon/ni.c

View file

11

drivers/gpu/drm/radeon/nid.h

View file

207

drivers/gpu/drm/radeon/r600.c

View file

7

drivers/gpu/drm/radeon/r600_audio.c

View file

42

drivers/gpu/drm/radeon/r600_cs.c

View file

8

drivers/gpu/drm/radeon/r600_hdmi.c

View file

4

drivers/gpu/drm/radeon/r600d.h

View file

10

drivers/gpu/drm/radeon/radeon.h

View file

33

drivers/gpu/drm/radeon/radeon_cs.c

View file

4

drivers/gpu/drm/radeon/radeon_drv.c

View file

19

drivers/gpu/drm/radeon/radeon_gart.c

View file

2

drivers/gpu/drm/radeon/radeon_kms.c

View file

10

drivers/gpu/drm/radeon/radeon_pm.c

View file

12

drivers/gpu/drm/radeon/radeon_prime.c

View file

12

drivers/gpu/drm/radeon/rs600.c

View file

12

drivers/gpu/drm/radeon/rs690.c

View file

297

drivers/gpu/drm/radeon/rv770.c

View file

7

drivers/gpu/drm/radeon/rv770d.h

View file

481

drivers/gpu/drm/radeon/si.c

View file

72

drivers/gpu/drm/radeon/si_reg.h

View file

19

drivers/gpu/drm/radeon/sid.h

View file

2

drivers/gpu/drm/sis/sis_drv.c

View file

14

drivers/gpu/drm/ttm/ttm_bo.c

View file

15

drivers/gpu/drm/udl/udl_drv.c

View file

3

drivers/gpu/drm/via/via_map.c

View file

2

drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c

View file

27

drivers/gpu/vga/vga_switcheroo.c

View file

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