summaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | char/agp: replace numeric with standard PM state macrosYijing Wang2013-06-282-5/+5
| * | Merge tag 'v3.10-rc7' into drm-nextDave Airlie2013-06-271-23/+31
| |\ \ | | |/
| * | drm, agpgart: Use pgprot_writecombine for AGP maps and make the MTRR optionalAndy Lutomirski2013-05-311-3/+5
* | | mwave: fix info leak in mwave_ioctl()Dan Carpenter2013-07-091-0/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2013-07-058-17/+8
|\ \ \
| * | | hwrng: bcm2835 - fix MODULE_LICENSE tagArnd Bergmann2013-06-211-1/+1
| * | | hwrng: nomadik - use clk_prepare_enable()Linus Walleij2013-06-051-1/+1
| * | | hwrng: use platform_{get,set}_drvdata()Jingoo Han2013-06-053-9/+7
| * | | hwrng: tx4939 - remove unnecessary platform_set_drvdata()Jingoo Han2013-05-241-1/+0
| * | | hwrng: timeriomem - remove unnecessary platform_set_drvdata()Jingoo Han2013-05-241-2/+0
| * | | hwrng: bcm63xx - remove unnecessary platform_set_drvdata()Jingoo Han2013-05-241-2/+0
| * | | hwrng: atmel - remove unnecessary platform_set_drvdata()Jingoo Han2013-05-241-2/+0
* | | | Merge branch 'akpm' (updates from Andrew Morton)Linus Torvalds2013-07-031-47/+0
|\ \ \ \
| * | | | /dev/oldmem: Remove the interfaceZhang Yanfei2013-07-031-47/+0
* | | | | Merge tag 'pci-v3.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2013-07-032-2/+2
|\ \ \ \ \
| * | | | | PCI: Convert alloc_pci_dev(void) to pci_alloc_dev(bus)Gu Zheng2013-06-052-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2013-07-034-11/+14
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | tpm/tpm_i2c_infineon: Remove unused header filePeter Huewe2013-06-281-1/+0
| * | | | tpm: tpm_i2c_infinion: Don't modify i2c_client->driverLars-Peter Clausen2013-06-281-3/+0
| * | | | tpm: fix regression caused by section type conflict of tpm_dev_release() in p...Peter Huewe2013-05-272-1/+2
| * | | | tpm: move TPM_DIGEST_SIZE defintionMimi Zohar2013-05-211-1/+0
| * | | | tpm_tis: missing platform_driver_unregister() on error in init_tis()Wei Yongjun2013-05-211-5/+12
| |/ / /
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2013-07-032-51/+5
|\ \ \ \
| * | | | tile-srom: switch to fixed_size_llseek()Al Viro2013-06-291-25/+3
| * | | | ps3flash: switch to generic_file_llseek_size()Al Viro2013-06-291-26/+2
| | |_|/ | |/| |
* | | | Merge tag 'fixes-non-critical-for-linus' of git://git.kernel.org/pub/scm/linu...Linus Torvalds2013-07-021-1/+1
|\ \ \ \
| * | | | hwrng: bcm2835: fix MODULE_LICENSE tagArnd Bergmann2013-06-191-1/+1
| |/ / /
* | | | Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2013-07-021-1/+1
|\ \ \ \
| * | | | Finally eradicate CONFIG_HOTPLUGStephen Rothwell2013-06-031-1/+1
| |/ / /
OpenPOWER on IntegriCloud