Dave Airlie e8115e79aa Linux 3.18-rc7 ...

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJUe7l9AAoJEHm+PkMAQRiGkGcIAIryQ7NKn4IaxUtS807Lx4Ih
 obEnx7nNKZTXCZpD/7XQGHMMJyozMJR50PHZESJoHu4Luhv9h7EFRnyJ6MdqMlwn
 zla3zY0yRsHwPoJKcHbSE0CPHZz0WPQHj7IEbM+XJz2tMNJfbgTrezElmcCM4DRp
 c9ae+ggwZ2cyNYM0r2RSwSJ525WMh69f9dzSUE27fpvkllQgwqNs/jHYz8HNOEht
 FWcv5UhvzKjwJS3awULfOB3zH2QdFvVTrwAzd+kbV2Q6T6CaUoFRlhXeKUO6W2Jv
 pJM6oj8tMZUkdXEv7EQXT1kwEqC4DULTTTHs4tSF79O1ESmNfePiOwwBcwoM2nM=
 =kG1Y
 -----END PGP SIGNATURE-----

Merge tag 'v3.18-rc7' into drm-next

This fixes a bunch of conflicts prior to merging i915 tree.

Linux 3.18-rc7

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_drv.c
	drivers/gpu/drm/i915/i915_drv.c
	drivers/gpu/drm/i915/intel_pm.c
	drivers/gpu/drm/tegra/dc.c

2014-12-02 10:58:33 +10:00

..

dc.c

Linux 3.18-rc7

2014-12-02 10:58:33 +10:00

dc.h

drm/tegra: Implement more tiling modes

2014-08-04 10:07:34 +02:00

dpaux.c

drm/tegra: Renaming DP training vswing pre emph defines

2014-09-03 11:05:41 +02:00

dpaux.h

drm/tegra: dp: Support address-only I2C-over-AUX transactions

2014-04-08 16:12:36 +02:00

drm.c

drm/tegra: Plug memory leak

2014-11-13 16:18:32 +01:00

drm.h

drm/tegra: dc: Registers are 32 bits wide

2014-11-13 16:17:03 +01:00

dsi.c

drm/tegra: dsi: Set up PHY_TIMING & BTA_TIMING registers earlier

2014-11-13 16:12:44 +01:00

dsi.h

drm/tegra: dsi: Implement host transfers

2014-11-13 16:12:36 +01:00

fb.c

drm/tegra: fb: Add error codes to error messages

2014-11-13 16:18:34 +01:00

gem.c

drm/tegra: gem: Check before freeing CMA memory

2014-11-13 16:18:34 +01:00

gem.h

drm/tegra: gem: Use more consistent data types

2014-11-13 16:18:32 +01:00

gr2d.c

drm/tegra: add MODULE_DEVICE_TABLEs

2014-08-04 10:07:39 +02:00

gr2d.h

drm/tegra: Use symbolic names for gr2d registers

2013-10-31 09:55:44 +01:00

gr3d.c

ARM: SoC cleanups for 3.17

2014-08-08 11:00:26 -07:00

gr3d.h

drm/tegra: Add 3D support

2013-10-31 09:55:45 +01:00

hdmi.c

drm/tegra: add MODULE_DEVICE_TABLEs

2014-08-04 10:07:39 +02:00

hdmi.h

drm/tegra: hdmi - Disable LVDS mode

2014-06-05 23:09:25 +02:00

Kconfig

drm/tegra: Depend on COMMON_CLK

2014-11-13 16:10:27 +01:00

Makefile

drm/tegra: Remove host1x drm_bus implementation

2014-06-05 23:14:46 +02:00

mipi-phy.c

drm/tegra: Relicense under GPL v2

2014-04-04 09:12:51 +02:00

mipi-phy.h

drm/tegra: Relicense under GPL v2

2014-04-04 09:12:51 +02:00

output.c

drm/tegra: Detach panel when a connector is removed

2014-11-13 16:18:33 +01:00

rgb.c

drm/tegra: dc - Compute shift clock divider in output drivers

2014-06-05 23:09:33 +02:00

sor.c

ARM: SoC cleanups for 3.17

2014-08-08 11:00:26 -07:00

sor.h

drm/tegra: sor - Add CRC debugfs support

2014-06-05 23:09:17 +02:00