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
..
agp	agp/intel-agp: remove snb+ host bridge pciids	2012-06-25 21:10:35 +02:00
hw_random	Virtio patches, mainly hotplugging fixes.	2012-07-30 13:24:37 -07:00
ipmi	char/ipmi: remove local ioctl defines replaced by generic ones	2012-07-23 12:48:04 +02:00
mwave	8250: three way resolve of the 8250 diffs	2012-07-17 09:11:50 -07:00
pcmcia	pcmcia,synclink_cs: fix termios port I missed	2012-07-19 15:40:46 -07:00
tpm	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-07-23 18:49:06 -07:00
xilinx_hwicap	xilinx_hwicap: reset XHI_MAX_RETRIES	2012-04-19 19:09:18 -07:00
Kconfig	ramoops: Move to fs/pstore/ram.c	2012-05-16 08:06:37 -07:00
Makefile	ramoops: Move to fs/pstore/ram.c	2012-05-16 08:06:37 -07:00
apm-emulation.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm	2012-04-05 17:34:30 -07:00
applicom.c	…
applicom.h	…
bfin-otp.c	…
bsr.c	powerpc/BSR: cleanup the error path of bsr_init	2012-07-17 10:27:38 -07:00
ds1302.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
ds1620.c	…
dsp56k.c	…
dtlk.c	…
efirtc.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
generic_nvram.c	…
genrtc.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
hangcheck-timer.c	…
hpet.c	printk(): add KERN_CONT where needed in hpet and vt code	2012-04-09 10:30:39 -07:00
i8k.c	…
lp.c	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-29 18:12:23 -07:00
mbcs.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
mbcs.h	…
mem.c	powerpc: Disable /dev/port interface on systems without an ISA bridge	2012-07-11 18:22:32 +10:00
misc.c	…
mmtimer.c	…
msm_smd_pkt.c	…
mspec.c	[IA64] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts	2012-07-26 10:55:26 -07:00
nsc_gpio.c	…
nvram.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
nwbutton.c	…
nwbutton.h	…
nwflash.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
pc8736x_gpio.c	…
ppdev.c	…
ps3flash.c	…
random.c	random: mix in architectural randomness in extract_buf()	2012-07-27 22:37:20 -04:00
raw.c	…
rtc.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
scx200_gpio.c	…
snsc.c	…
snsc.h	…
snsc_event.c	…
sonypi.c	sonypi: Use struct dev_pm_ops for power management	2012-07-01 13:31:14 +02:00
tb0219.c	…
tile-srom.c	tile-srom.c driver: minor code cleanup	2012-04-02 12:14:10 -04:00
tlclk.c	…
toshiba.c	…
ttyprintk.c	…
uv_mmtimer.c	…
virtio_console.c	virtio: console: tell host of open ports after resume from s3/s4	2012-05-17 12:14:33 +03:00