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 |
| .. |
|
agp
|
agp/intel-gtt: Remove get/put_pages
|
2014-09-19 14:43:11 +02:00 |
|
hw_random
|
hwrng: pseries - port to new read API and fix stack corruption
|
2014-11-06 23:10:22 +08:00 |
|
ipmi
|
ipmi: Clear drvdata when interface is removed
|
2014-10-07 13:22:32 -04:00 |
|
mwave
|
drivers/char: delete non-required instances of include <linux/init.h>
|
2014-02-07 15:10:19 -08:00 |
|
pcmcia
|
char: synclink: Remove WARN_ON for bad port count
|
2014-07-10 16:07:46 -07:00 |
|
tpm
|
xen: remove DEFINE_XENBUS_DRIVER() macro
|
2014-10-06 10:27:57 +01:00 |
|
xilinx_hwicap
|
char: xilinx_hwicap: Remove .owner field for driver
|
2014-09-23 23:13:13 -07:00 |
|
xillybus
|
xillybus: Move out of staging
|
2014-09-23 23:44:16 -07:00 |
|
apm-emulation.c
|
apm-emulation: add hibernation APM events to support suspend2disk
|
2014-01-07 13:50:28 +01:00 |
|
applicom.c
|
applicom: dereferencing NULL on error path
|
2014-05-27 17:43:12 -07:00 |
|
applicom.h
|
|
|
|
bfin-otp.c
|
|
|
|
bsr.c
|
bsr: avoid format string leaking into device name
|
2014-07-09 16:59:15 -07:00 |
|
ds1302.c
|
|
|
|
ds1620.c
|
|
|
|
dsp56k.c
|
drivers/char/dsp56k.c: drop check for negativity of unsigned parameter
|
2014-07-17 18:38:37 -07:00 |
|
dtlk.c
|
|
|
|
efirtc.c
|
|
|
|
generic_nvram.c
|
|
|
|
genrtc.c
|
|
|
|
hangcheck-timer.c
|
hangcheck-timer: Use ktime_get_ns()
|
2014-07-23 15:01:49 -07:00 |
|
hpet.c
|
|
|
|
i8k.c
|
i8k: Add support for Dell Latitude E6540
|
2014-09-23 23:26:42 -07:00 |
|
Kconfig
|
xillybus: Move out of staging
|
2014-09-23 23:44:16 -07:00 |
|
lp.c
|
|
|
|
Makefile
|
xillybus: Move out of staging
|
2014-09-23 23:44:16 -07:00 |
|
mbcs.c
|
|
|
|
mbcs.h
|
|
|
|
mem.c
|
switch /dev/zero and /dev/full to ->read_iter()
|
2014-10-09 02:39:08 -04:00 |
|
misc.c
|
|
|
|
mmtimer.c
|
|
|
|
msm_smd_pkt.c
|
|
|
|
mspec.c
|
|
|
|
nsc_gpio.c
|
|
|
|
nvram.c
|
|
|
|
nwbutton.c
|
char: nwbutton: open-code interruptible_sleep_on
|
2014-01-08 15:29:52 -08:00 |
|
nwbutton.h
|
|
|
|
nwflash.c
|
|
|
|
pc8736x_gpio.c
|
|
|
|
ppdev.c
|
|
|
|
ps3flash.c
|
|
|
|
random.c
|
This adds a memzero_explicit() call which is guaranteed not to be
|
2014-10-24 12:33:32 -07:00 |
|
raw.c
|
Return short read or 0 at end of a raw device, not EIO
|
2014-10-31 06:33:26 -04:00 |
|
rtc.c
|
|
|
|
scx200_gpio.c
|
|
|
|
snsc.c
|
|
|
|
snsc.h
|
|
|
|
snsc_event.c
|
|
|
|
sonypi.c
|
|
|
|
tb0219.c
|
|
|
|
tile-srom.c
|
char: tile-srom: Add real platform bus parent
|
2014-10-02 10:19:34 -04:00 |
|
tlclk.c
|
|
|
|
toshiba.c
|
|
|
|
ttyprintk.c
|
ttyprintk: Allow built as a module
|
2014-04-16 14:21:06 -07:00 |
|
uv_mmtimer.c
|
|
|
|
virtio_console.c
|
virtio_console: move early VQ enablement
|
2014-11-13 09:53:26 +02:00 |