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
..
accessibility
acpi
amba
ata	ARM: arm-soc Marvell Orion device-tree updates	2012-08-02 11:50:24 -07:00
atm
auxdisplay
base	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-08-01 10:26:23 -07:00
bcma
block	Merge branch 'for-3.6/drivers' of git://git.kernel.dk/linux-block	2012-08-01 09:06:47 -07:00
bluetooth	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -07:00
cdrom
char	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -07:00
clk	clk: validate pointer in __clk_disable()	2012-07-30 17:25:13 -07:00
clocksource
connector
cpufreq
cpuidle
crypto	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
dca
devfreq
dio
dma	SuperH fixes for 3.6-rc1 merge window	2012-08-02 11:45:42 -07:00
edac
eisa
extcon
firewire
firmware	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
gpio
gpu
hid	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-07-31 18:47:44 -07:00
hsi
hv	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
hwmon
hwspinlock
i2c	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
ide
idle
ieee802154
iio
infiniband
input	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
iommu
isdn	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -07:00
leds
lguest
macintosh
md	Additional md update for 3.6	2012-08-02 11:34:40 -07:00
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-07-31 18:47:44 -07:00
memory
memstick
message	drivers/message/i2o/i2o_config.c: bound allocation	2012-07-30 17:25:17 -07:00
mfd	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
misc	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -07:00
mmc	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -07:00
mtd	Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm	2012-08-01 16:41:07 -07:00
net	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -07:00
nfc
nubus
of
oprofile
parisc
parport
pci
pcmcia
pinctrl
platform	Platform: OLPC: move global variables into priv struct	2012-07-31 23:27:31 -04:00
pnp
power	Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc	2012-08-02 11:52:39 -07:00
pps	pps: return PTR_ERR on error in device_create	2012-07-30 17:25:21 -07:00
ps3
ptp
pwm
rapidio
regulator	regulator: Fix an s5m8767 build failure	2012-07-31 00:51:09 +02:00
remoteproc
rpmsg
rtc	Merge branch 'akpm' (Andrew's patch-bomb)	2012-07-31 19:25:39 -07:00
s390
sbus
scsi	Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-block	2012-08-01 09:02:41 -07:00
sfi
sh	Merge branch 'common/irqdomain' into sh-latest	2012-08-01 17:14:52 +09:00
sn
spi	Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm	2012-08-01 16:41:07 -07:00
ssb
staging	Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc	2012-08-02 11:52:39 -07:00
target	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-08-01 10:26:23 -07:00
tc
thermal	The tag contains just a few battery-related changes for v3.6. It's is	2012-07-31 18:08:25 -07:00
tty	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -07:00
uio
usb	Merge tty-next into 3.6-rc1	2012-08-06 09:48:31 -07:00
uwb
vfio	vfio: Add PCI device driver	2012-07-31 08:16:24 -06:00
vhost
video	fbdev updates for 3.6	2012-08-01 10:45:12 -07:00
virt
virtio
vlynq
vme
w1
watchdog	ARM: arm-soc Marvell Orion device-tree updates	2012-08-02 11:50:24 -07:00
xen
zorro
Kconfig	vfio: VFIO core	2012-07-31 08:16:22 -06:00
Makefile	vfio: VFIO core	2012-07-31 08:16:22 -06:00