Greg Kroah-Hartman c87985a3ce Merge tty-next into 3.6-rc1 ... This handles the merge issue in: arch/um/drivers/line.c arch/um/drivers/line.h And resolves the duplicate patches that were in both trees do to the tty-next branch not getting merged into 3.6-rc1. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-08-06 09:48:31 -07:00
..
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-07-26 14:28:55 -07:00
asm-generic	Merge branch 'akpm' (Andrew's patch-bomb)	2012-07-30 17:25:34 -07:00
crypto
drm	drm/exynos: add property for plane zpos	2012-07-27 11:13:54 +09:00
keys
linux	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -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	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -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 'akpm' (Andrew's patch-bomb)	2012-07-31 19:25:39 -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