Dave Airlie e8115e79aa 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

..

android

staging: android: logger: Fix log corruption regression

2014-10-28 18:24:30 -04:00

bcm

Staging: bcm: Removed unnecessary else.

2014-10-02 09:33:46 -07:00

board

…

comedi

staging: comedi: fix memory leak / bad pointer freeing for chanlist

2014-10-29 16:18:31 +08:00

cptm1217

…

dgap

staging: dgap: use dgap_release_remap() in dgap_cleanup_board()

2014-09-23 23:39:25 -07:00

dgnc

Merge tag 'tty-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2014-10-08 06:52:11 -04:00

emxx_udc

staging: emxx_udc: Use min_t instead of min

2014-10-02 13:51:03 -07:00

ft1000

staging: ft1000: ft1000-usb: Removed unnecessary else statement.

2014-10-02 10:13:37 -07:00

fwserial

…

gdm72xx

drivers: staging: gdm72xx: Removed unnecessary braces.

2014-09-28 23:27:35 -04:00

gdm724x

staging: gdm724x: Removed unnecessary else expression.

2014-09-28 23:27:34 -04:00

goldfish

staging: goldfish: avoid multiple assignments

2014-09-06 21:54:57 -07:00

gs_fpgaboot

staging: gs_fpgaboot Fix trailing whitespace.

2014-09-19 17:42:15 -07:00

iio

staging:iio:ade7758: Remove "raw" from channel name

2014-11-05 18:33:48 +00:00

line6

staging: line6: fix midibuf.c coding style issue

2014-09-23 23:41:25 -07:00

lustre

Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-10-13 16:23:15 +02:00

media

Merge tag 'media/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2014-10-10 22:04:49 -04:00

mt29f_spinand

…

netlogic

staging: netlogic: fix checkpatch.pl "LINE_SPACING" issuses

2014-09-08 14:02:13 -07:00

nvec

…

octeon

staging: octeon: Combined seperate strings.

2014-10-02 09:59:20 -07:00

octeon-usb

Staging: octeon-hcd: removed dummy label

2014-09-11 14:49:13 -07:00

olpc_dcon

…

ozwpan

staging: ozwpan: Remove typedefs

2014-09-28 22:03:58 -04:00

panel

…

rtl8188eu

staging: r8188eu: Add new device ID for DLink GO-USB-N150

2014-11-27 08:55:01 -08:00

rtl8192e

staging: rtl8192e: use %*pEn to escape buffer

2014-10-14 02:18:27 +02:00

rtl8192u

staging: rtl8192u: use %*pEn to escape buffer

2014-10-14 02:18:27 +02:00

rtl8712

staging: rtl8712: Fixed else not required after return

2014-10-02 11:59:40 -07:00

rtl8723au

staging: rtl8723au: Fix alignment of mac_addr for ether_addr_copy() usage

2014-10-20 12:51:10 +08:00

rts5208

staging: rts5208: remove unnecessary else

2014-10-02 10:07:04 -07:00

skein

staging: skein: replace spaces with tabs

2014-09-19 17:27:28 -07:00

slicoss

staging: slicoss: Fix void function return statements style warning

2014-09-28 23:36:24 -04:00

speakup

staging: speakup: Fixed warning <linux/serial.h> instead of <asm/serial.h>

2014-10-02 10:09:01 -07:00

ste_rmi4

Staging: ste_rmi4: add new line after declarations

2014-09-23 13:44:11 -07:00

unisys

staging: unisys: Fix CamelCase in uislib_force_channel_interrupt()

2014-10-02 09:49:29 -07:00

vme

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2014-10-13 11:28:42 +02:00

vt6655

staging: vt6655: Fixed C99 // comment errors in wpactl.c

2014-10-02 10:11:26 -07:00

vt6656

staging: vt6656: Merge three lines into one

2014-09-28 23:22:21 -04:00

wlan-ng

staging: wlan-ng: use %*pEhp to print SN

2014-10-14 02:18:27 +02:00

xgifb

staging: xgifb: remove unnecessary else

2014-09-06 21:48:19 -07:00

Kconfig

drm: imx: Move imx-drm driver out of staging

2014-11-26 09:40:39 +10:00

Makefile

drm: imx: Move imx-drm driver out of staging

2014-11-26 09:40:39 +10:00

staging.c

…