Daniel Vetter a22ddff8be Linux 3.6-rc2 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJQLWtvAAoJEHm+PkMAQRiG/DYH+wd0FqfEuYkYk4KPyAPuhKpX zX7HYfLvyJE/ZYIdrhjq1E6Xm2KNr7gtX7/Rdzi2W38M9sjbYzwG1UGIw51qnxWy yZJH9BGkfyQgQPeuDGohfB6DkDy2JWr2eqMDvakjOwgBsIzji0PQD/f3UvndhtUa c+tTj/kjavHE1Yr2Wy6OnRZz3Uc0hIMn/Q0JqtbCs3LUgEV1KA4OEAe56XNz4Ku4 WE+FFaGFPvtriQsQON+ohPS5IC8jzQGK/0vbrJ4lWjFnZy4gvZXnborTOwD0WSQG fbsNuxp1AaM2/pqfMwXm1w0ADvwOITHNiwwXf9id6DoK81QwTFpUdvKpn6yB6gQ= =rurr -----END PGP SIGNATURE----- Merge tag 'v3.6-rc2' into drm-intel-next Backmerge Linux 3.6-rc2 to resolve a few funny conflicts before we put even more madness on top: - drivers/gpu/drm/i915/i915_irq.c: Just a spurious WARN removed in -fixes, that has been changed in a variable-rename in -next, too. - drivers/gpu/drm/i915/intel_ringbuffer.c: -next remove scratch_addr (since all their users have been extracted in another fucntion), -fixes added another user for a hw workaroudn. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2012-08-17 09:01:08 +02:00
..
acpi	Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'osc-pcie' into base	2012-08-03 00:31:23 -04:00
asm-generic	Merge branch 'akpm' (Andrew's patch-bomb)	2012-07-30 17:25:34 -07:00
crypto
drm	Linux 3.6-rc2	2012-08-17 09:01:08 +02:00
keys
linux	VFIO for v3.6-rc1	2012-08-16 11:47:42 -07:00
math-emu
media	[media] v4l2: add core support for the new VIDIOC_ENUM_FREQ_BANDS ioctl	2012-07-30 20:23:05 -03:00
memory
misc
mtd
net	codel: refine one condition to avoid a nul rec_inv_sqrt	2012-08-10 16:52:54 -07:00
pcmcia
ras
rdma	Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma' and 'qib' into for-linus	2012-07-22 23:26:17 -07:00
rxrpc
scsi	Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream	2012-07-25 15:58:48 -04:00
sound	Sound fixes for 3.6-rc1	2012-08-01 10:42:26 -07:00
target	target: Allow for target_submit_cmd() returning errors	2012-07-17 17:05:05 -07:00
trace	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-08-03 10:57:20 -07:00
video	video: da8xx-fb: configure FIFO threshold to reduce underflow errors	2012-07-29 01:11:09 +00:00
xen	xen PVonHVM: move shared_info to MMIO before kexec	2012-07-19 15:52:05 -04:00
Kbuild