Greg Kroah-Hartman 9f48c89862 Merge 3.16-rc5 into char-misc-next ... This resolves a number of merge issues with changes in this tree and Linus's tree at the same time. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2014-07-13 15:26:47 -07:00
..
agp	agp: info leak in agpioc_info_wrap()	2014-05-06 13:05:00 -07:00
hw_random	Main excitement is a virtio_scsi fix for alloc holding spinlock on the abort	2014-06-11 21:10:33 -07:00
ipmi	Merge branch 'sched/urgent' into sched/core, to avoid conflicts	2014-05-07 13:15:46 +02:00
mwave	drivers/char: delete non-required instances of include <linux/init.h>	2014-02-07 15:10:19 -08:00
pcmcia	tty: Fix help text of SYNCLINK_CS	2014-04-16 14:31:13 -07:00
tpm	Merge branch 'acpica'	2014-06-03 23:12:27 +02:00
xilinx_hwicap	char: xilinx_hwicap: missing error code if ioremap() fails	2014-07-09 16:59:58 -07:00
apm-emulation.c	apm-emulation: add hibernation APM events to support suspend2disk	2014-01-07 13:50:28 +01:00
applicom.c	applicom: dereferencing NULL on error path	2014-05-27 17:43:12 -07:00
applicom.h
bfin-otp.c
bsr.c	bsr: avoid format string leaking into device name	2014-07-09 16:59:15 -07:00
ds1302.c
ds1620.c
dsp56k.c
dtlk.c
efirtc.c
generic_nvram.c
genrtc.c
hangcheck-timer.c
hpet.c
i8k.c	Merge 3.16-rc5 into char-misc-next	2014-07-13 15:26:47 -07:00
Kconfig	ttyprintk: Allow built as a module	2014-04-16 14:21:06 -07:00
lp.c
Makefile	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2014-01-29 20:49:12 -08:00
mbcs.c
mbcs.h
mem.c	/dev/mem: handle out-of-bounds read/write	2014-02-15 11:51:02 -08:00
misc.c
mmtimer.c
msm_smd_pkt.c
mspec.c
nsc_gpio.c
nvram.c
nwbutton.c	char: nwbutton: open-code interruptible_sleep_on	2014-01-08 15:29:52 -08:00
nwbutton.h
nwflash.c
pc8736x_gpio.c
ppdev.c
ps3flash.c
random.c	random: fix entropy accounting bug introduced in v3.15	2014-06-17 14:23:14 -10:00
raw.c	blkdev_aio_write() - turn into blkdev_write_iter()	2014-05-06 17:38:01 -04:00
rtc.c
scx200_gpio.c
snsc.c
snsc.h
snsc_event.c
sonypi.c
tb0219.c
tile-srom.c	drivers/char: delete non-required instances of include <linux/init.h>	2014-02-07 15:10:19 -08:00
tlclk.c
toshiba.c
ttyprintk.c	ttyprintk: Allow built as a module	2014-04-16 14:21:06 -07:00
uv_mmtimer.c
virtio_console.c	pipe: kill ->map() and ->unmap()	2014-04-01 23:19:19 -04:00