aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2013-09-091-11/+16
|\
| * virtio: console: prevent use-after-free of port name in port unplugAmit Shah2013-08-091-2/+1
| * Merge branch 'master' into virtio-nextRusty Russell2013-08-092-24/+52
| |\
| * | virtio: console: cleanup an error messageDan Carpenter2013-07-301-4/+2
| * | virtio: console: fix locking around send_sigio_to_port()Amit Shah2013-07-291-3/+5
| * | virtio: console: add locking in port unplug pathAmit Shah2013-07-291-0/+2
| * | virtio: console: add locks around buffer removal in port unplug pathAmit Shah2013-07-291-2/+6
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2013-09-076-79/+330
|\ \ \
| * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linuxHerbert Xu2013-09-075-9/+12
| |\ \ \ | | |/ /
| * | | hwrng: via - Add MODULE_DEVICE_TABLEBen Hutchings2013-09-021-0/+7
| * | | hwrng: omap - reorder OMAP TRNG driver codeOlof Johansson2013-08-211-54/+54
| * | | hwrng: tx4939 - simplify use of devm_ioremap_resourceJulia Lawall2013-08-141-3/+1
| * | | hwrng: pixocel - Staticize 'rng_dev'Jingoo Han2013-08-091-1/+1
| * | | hwrng: omap - Add OMAP4 TRNG supportLokesh Vutla2013-08-092-53/+305
| * | | hwrng: omap - Add device tree supportLokesh Vutla2013-08-091-0/+12
| * | | hwrng: omap - Remove duplicated function callLokesh Vutla2013-08-091-1/+0
| * | | hwrng: omap - Convert to devm_kzalloc()Lokesh Vutla2013-08-091-7/+2
| * | | hwrng: omap - Use module_platform_driver macroLokesh Vutla2013-08-091-16/+2
| * | | hwrng: mxc-rnga - Check the return value from clk_prepare_enable()Fabio Estevam2013-08-011-1/+3
* | | | Merge branch 'ipmi'Linus Torvalds2013-09-053-1/+79
|\ \ \ \
| * | | | BMC support for PARISC machinesThomas Bogendoerfer2013-09-051-0/+75
| * | | | Add MODULE_ALIAS for autoloading ipmi driver on ACPI systemsJordan_Hargrave@Dell.com2013-09-051-0/+2
| * | | | ipmi: Initialize locals to avoid warningCorey Minyard2013-09-051-1/+1
| * | | | ipmi: info leak in compat_ipmi_ioctl()Dan Carpenter2013-09-051-0/+1
| | |_|/ | |/| |
* | | | Merge tag 'stable/for-linus-3.12-rc0-tag' of git://git.kernel.org/pub/scm/lin...Linus Torvalds2013-09-043-0/+486
|\ \ \ \
| * | | | drivers/xen-tpmfront: Fix compile issue with missing option.Konrad Rzeszutek Wilk2013-08-301-0/+1
| * | | | drivers/tpm: add xen tpmfront interfaceDaniel De Graaf2013-08-093-0/+485
* | | | | Merge tag 'PTR_RET-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2013-09-041-1/+1
|\ \ \ \ \
| * | | | | PTR_RET is now PTR_ERR_OR_ZERO(): Replace most.Rusty Russell2013-07-151-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge tag 'pm+acpi-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2013-09-031-5/+0
|\ \ \ \ \
| * \ \ \ \ Merge back earlier 'acpi-assorted' materialRafael J. Wysocki2013-08-141-5/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | ACPI: Remove the old /proc/acpi/event interfaceThomas Renninger2013-07-151-5/+0
| | |/ / /
* | | | | Merge tag 'driver-core-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2013-09-032-19/+27
|\ \ \ \ \
| * | | | | char: tile-srom: fix build errorGreg Kroah-Hartman2013-07-251-1/+1
| * | | | | tile: srom: convert srom_class to use dev_groupsGreg Kroah-Hartman2013-07-241-12/+16
| * | | | | bsr: convert bsr_class to use dev_groupsGreg Kroah-Hartman2013-07-241-7/+11
| | |/ / / | |/| | |
* | | | | Merge 3.11-rc6 into char-misc-nextGreg Kroah-Hartman2013-08-182-24/+52
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2013-08-081-22/+48
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | virtio: console: return -ENODEV on all read operations after unplugAmit Shah2013-07-291-1/+5
| | * | | virtio: console: fix raising SIGIO after port unplugAmit Shah2013-07-291-3/+5
| | * | | virtio: console: clean up port data immediately at time of unplugAmit Shah2013-07-291-8/+8
| | * | | virtio: console: fix race in port_fops_open() and port unplugAmit Shah2013-07-291-0/+4
| | * | | virtio: console: fix race with port unplug and open/closeAmit Shah2013-07-291-7/+6
| | * | | virtio/console: Add pipe_lock/unlock for splice_writeYoshihiro YUNOMAE2013-07-231-5/+15
| | * | | virtio/console: Quit from splice_write if pipe->nrbufs is 0Yoshihiro YUNOMAE2013-07-231-0/+7
| | |/ /
| * | | parisc: agp/parisc-agp: allow binding of user memory to the AGP GARTAlex Ivanov2013-07-311-2/+4
| |/ /
* | | pcmcia: synclink_cs: replace sum of bitmasks with OR operation.Alexandru Juncu2013-07-261-13/+13
|/ /
* | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2013-07-131-1/+1
|\ \
| * | MIPS: OCTEON: Rename Kconfig CAVIUM_OCTEON_REFERENCE_BOARD to CAVIUM_OCTEON_SOCDavid Daney2013-06-101-1/+1
* | | Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2013-07-093-8/+10
|\ \ \