Daniel Vetter 7f16e5c141 Merge tag 'v3.12' into drm-intel-next ... I want to merge in the new Broadwell support as a late hw enabling pull request. But since the internal branch was based upon our drm-intel-nightly integration branch I need to resolve all the oustanding conflicts in drm/i915 with a backmerge to make the 60+ patches apply properly. We'll propably have some fun because Linus will come up with a slightly different merge solution. Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/intel_crt.c drivers/gpu/drm/i915/intel_ddi.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_dp.c drivers/gpu/drm/i915/intel_drv.h All rather simple adjacent lines changed or partial backports from -next to -fixes, with the exception of the thaw code in i915_dma.c. That one needed a bit of shuffling to restore the intent. Oh and the massive header file reordering in intel_drv.h is a bit trouble. But not much. v2: Also don't forget the fixup for the silent conflict that results in compile fail ... Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2013-11-04 16:28:52 +01:00
..
android	Merge git://git.kvack.org/~bcrl/aio-next	2013-09-13 10:55:58 -07:00
bcm	Staging: bcm: info leak in ioctl	2013-10-30 12:24:49 -07:00
btmtk_usb
ced1401
comedi	staging: comedi: ni_65xx: (bug fix) confine insn_bits to one subdevice	2013-10-03 14:27:32 -07:00
cptm1217
crystalhd	staging: crystalhd: Resolve sparse 'different base types' warnings.	2013-08-30 11:46:46 -07:00
cxt1e1	staging: cxt1e1: Remove #define SBE_INCLUDE_SYMBOLS	2013-08-12 15:20:25 -07:00
dgap	staging: dgap: fix overflows and format strings	2013-09-17 07:39:27 -07:00
dgnc	staging: dgnc: fix potential format string flaw	2013-09-17 07:39:27 -07:00
dgrp	TTY/Serial driver patches for 3.12-rc1	2013-09-03 11:38:36 -07:00
dwc2	staging: dwc2: make dwc2_core_params documentation more complete	2013-08-30 14:14:54 -07:00
echo
et131x	staging: et131x: Remove frame error TODO item	2013-08-21 10:02:28 -07:00
frontier	staging: frontier: use better DEVICE_ATTR_ macros	2013-08-24 10:30:28 -07:00
ft1000	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-07-09 18:24:39 -07:00
fwserial	IEEE 1394 (FireWire) subsystem changes post v3.10:	2013-07-10 11:02:58 -07:00
gdm72xx	staging: gdm72xx: potential use after free in send_qos_list()	2013-07-23 15:08:50 -07:00
gdm724x	staging: gdm724x: Remove version.h header inclusion in netlink_k.c	2013-08-27 22:53:22 -07:00
goldfish
iio	staging: iio: ade7854-spi: Fix return value	2013-09-18 19:43:33 +01:00
imx-drm	drm: Add separate Kconfig option for fbdev helpers	2013-10-11 23:36:58 +02:00
keucr	staging: keucr: be explicit to the sysfs file permissions	2013-08-24 10:33:07 -07:00
line6	staging: line6: add bounds check in snd_toneport_source_put()	2013-09-17 07:39:28 -07:00
lustre	staging: lustre: Cocci spatch "noderef"	2013-09-25 16:53:38 -07:00
media	[media] msi3101: correct max videobuf2 alloc	2013-09-24 13:30:35 -03:00
netlogic
nvec	staging: nvec: re-enable the clock on resume	2013-07-29 11:29:37 -07:00
octeon	staging: octeon-ethernet: rgmii: enable interrupts that we can handle	2013-09-17 07:39:28 -07:00
octeon-usb	staging: octeon-usb: Cocci spatch "noderef"	2013-09-25 16:53:39 -07:00
olpc_dcon	Staging: olpc_dcon: Removed more completed TODO entries	2013-08-21 10:02:28 -07:00
ozwpan	staging: ozwpan: prevent overflow in oz_cdev_write()	2013-10-30 12:24:49 -07:00
panel
phison
quickstart	staging: quickstart: fix up sysfs file permissions	2013-08-24 10:34:53 -07:00
rtl8187se	staging: Update e-mail address for Andrea Merello	2013-08-27 22:03:53 -07:00
rtl8188eu	staging: r8188eu: Add new device ID	2013-09-26 16:44:45 -07:00
rtl8192e	staging: Update e-mail address for Andrea Merello	2013-08-27 22:03:53 -07:00
rtl8192u	Staging: rtl8192u: r819xU_cmdpkt: checking NULL value after doing dev_alloc_skb	2013-09-25 16:53:39 -07:00
rtl8712	staging: rtl8712: return MAC in standard form	2013-07-23 14:52:19 -07:00
rts5139
sb105x	Staging: sb105x: info leak in mp_get_count()	2013-10-30 12:24:50 -07:00
sbe-2t3e3
sep
serqt_usb2
silicom	Staging: silicom: Remove useless unneeded semicolons	2013-07-23 14:42:56 -07:00
slicoss
sm7xxfb
speakup
ste_rmi4
tidspbridge	staging: tidspbridge: Fix typos in comments	2013-08-21 10:02:28 -07:00
usbip	staging: usbip: use DEVICE_ATTR_RO/RW for sysfs attributes	2013-08-26 12:02:54 -07:00
vme
vt6655	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-09-05 14:54:29 -07:00
vt6656	staging: vt6656: [BUG] iwctl_siwencodeext return if device not open	2013-09-25 16:53:40 -07:00
winbond	Staging: winbond: mds_f: deleted extern function	2013-08-12 14:55:50 -07:00
wlags49_h2	staging: wlags49_h2: buffer overflow setting station name	2013-10-30 12:24:49 -07:00
wlags49_h25	staging: wlags49_h2: remove sysfs file	2013-08-24 10:24:40 -07:00
wlan-ng
xgifb	Staging: xgifb: Fixed a warning of Space before semicolon	2013-08-12 14:08:27 -07:00
xillybus	staging: xillybus: fix format string usage	2013-09-17 07:39:27 -07:00
zram	Revert "staging: zram: Add auto loading of module if user opens /dev/zram."	2013-09-17 07:39:28 -07:00
zsmalloc	staging: zsmalloc: access page->private by using page_private macro	2013-07-23 14:52:19 -07:00
Kconfig	staging: dgap: adds driver to kernel build	2013-08-22 10:47:53 -07:00
Makefile	staging: dgap: adds driver to kernel build	2013-08-22 10:47:53 -07:00
staging.c