iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers
History
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
Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86
2012-07-30 11:54:53 -07:00
amba
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00
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
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2012-07-27 11:15:03 -04:00
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
arm-soc: new SoC support
2012-07-23 16:31:31 -07:00
connector
…
cpufreq
ARM: arm-soc soc updates, take 2
2012-07-30 09:45:53 -07:00
cpuidle
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-07-26 14:28:55 -07:00
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
Merge branch 'devel'
2012-07-29 21:11:05 -03:00
eisa
…
extcon
MFD bits for the 3.6 merge window.
2012-07-30 12:41:17 -07:00
firewire
- Small fixes and optimizations.
2012-07-30 09:32:39 -07:00
firmware
This patch series contains a major revamp of how we collect entropy
2012-07-31 19:07:42 -07:00
gpio
MFD bits for the 3.6 merge window.
2012-07-30 12:41:17 -07:00
gpu
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2012-07-30 10:06:23 -07:00
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
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2012-07-30 10:10:26 -07:00
hwspinlock
…
i2c
This patch series contains a major revamp of how we collect entropy
2012-07-31 19:07:42 -07:00
ide
…
idle
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-07-26 14:28:55 -07:00
ieee802154
…
iio
…
infiniband
Merge branches 'cma', 'ipoib', 'ocrdma' and 'qib' into for-next
2012-07-30 07:47:27 -07:00
input
This patch series contains a major revamp of how we collect entropy
2012-07-31 19:07:42 -07:00
iommu
IOMMU Updates for Linux v3.6-rc1
2012-07-24 16:24:11 -07:00
isdn
Merge tty-next into 3.6-rc1
2012-08-06 09:48:31 -07:00
leds
leds-lp8788: forgotten unlock at lp8788_led_work
2012-07-27 08:16:07 +08:00
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
Devicetree updates for 3.6
2012-07-24 14:07:22 -07:00
oprofile
…
parisc
PCI changes for the 3.6 merge window:
2012-07-24 16:17:07 -07:00
parport
…
pci
PCI changes for the 3.6 merge window:
2012-07-24 16:17:07 -07:00
pcmcia
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00
pinctrl
Pin control changes for v3.6:
2012-07-24 14:05:46 -07:00
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
pwm: pwm-tiehrpwm: PWM driver support for EHRPWM
2012-07-26 07:45:20 +02:00
rapidio
…
regulator
regulator: Fix an s5m8767 build failure
2012-07-31 00:51:09 +02:00
remoteproc
A batch of remoteproc patches for 3.6:
2012-07-26 16:19:08 -07:00
rpmsg
A batch of remoteproc patches for 3.6:
2012-07-26 16:19:08 -07:00
rtc
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-31 19:25:39 -07:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-07-26 18:09:01 -07:00
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
vhost: make vhost work queue visible
2012-07-22 01:22:23 +03:00
video
fbdev updates for 3.6
2012-08-01 10:45:12 -07:00
virt
…
virtio
[SCSI] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning
2012-07-20 08:59:03 +01:00
vlynq
…
vme
VME: Prevent D16 cycles being split into 8-bit blocks
2012-07-19 15:39:39 -07:00
w1
Driver core merge for 3.6-rc1
2012-07-26 11:25:33 -07:00
watchdog
ARM: arm-soc Marvell Orion device-tree updates
2012-08-02 11:50:24 -07:00
xen
PCI changes for the 3.6 merge window:
2012-07-24 16:17:07 -07:00
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