summaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Expand)AuthorAgeFilesLines
* ipmi: Add missing rv in ipmi_parisc_probe()Geert Uytterhoeven2014-01-301-0/+1
* Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2014-01-295-7/+25
|\
| * Merge commit origin/master into drm-intel-nextDaniel Vetter2014-01-162-6/+16
| |\
| * \ Merge tag 'v3.13-rc3' into drm-intel-next-queuedDaniel Vetter2013-12-0937-422/+2034
| |\ \
| * | | drm/i915: Kill legeacy AGP for gen3 kmsDaniel Vetter2013-11-141-5/+0
| * | | drm/i915: Make AGP support optionalVille Syrjälä2013-11-084-2/+25
* | | | Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2014-01-291-1/+1
|\ \ \ \
| * | | | Update Jean Delvare's e-mail addressJean Delvare2014-01-291-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'ipmi' (ipmi patches from Corey Minyard)Linus Torvalds2014-01-254-25/+39
|\ \ \ \
| * | | | ipmi: Cleanup error returnCorey Minyard2014-01-251-15/+29
| * | | | ipmi: fix timeout calculation when bmc is disconnectedXie XiuQi2014-01-251-1/+1
| * | | | ipmi: use USEC_PER_SEC instead of 1000000 for more meaningfulXie XiuQi2014-01-253-7/+7
| * | | | ipmi: remove deprecated IRQF_DISABLEDMichael Opdenacker2014-01-251-2/+2
| |/ / /
* | | | Merge tag 'pm+acpi-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2014-01-244-272/+154
|\ \ \ \
| | \ \ \
| | \ \ \
| *-. \ \ \ Merge branches 'pm-sleep', 'pm-runtime' and 'pm-apm'Rafael J. Wysocki2014-01-121-2/+9
| |\ \ \ \ \
| | | * \ \ \ Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Rafael J. Wysocki2014-01-111-2/+9
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | apm-emulation: add hibernation APM events to support suspend2diskBin Shi2014-01-071-2/+9
| | | | |/ /
| * | | | | Merge branch 'acpi-dsm'Rafael J. Wysocki2014-01-121-263/+142
| |\ \ \ \ \
| | * | | | | ACPI / TPM: detect PPI features by checking availability of _DSM functionsJiang Liu2014-01-051-26/+19
| | * | | | | ACPI / TPM: replace open-coded _DSM code with helper functionsJiang Liu2014-01-051-259/+145
| | * | | | | ACPI / TPM: match node name instead of full path when searching for TPM deviceJiang Liu2014-01-051-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'acpi-cleanup'Rafael J. Wysocki2014-01-123-7/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | ACPI: Clean up inclusions of ACPI header filesLv Zheng2013-12-073-7/+3
* | | | | | Merge tag 'stable/for-linus-3.14-rc0-tag' of git://git.kernel.org/pub/scm/lin...Linus Torvalds2014-01-221-0/+4
|\ \ \ \ \ \
| * | | | | | xen/pvhvm: If xen_platform_pci=0 is set don't blow up (v4).Konrad Rzeszutek Wilk2014-01-031-0/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2014-01-222-2/+1
|\ \ \ \ \ \
| * | | | | | treewide: Fix typos in printkMasanari Iida2013-12-191-1/+1
| * | | | | | Merge branch 'master' into for-nextJiri Kosina2013-12-1942-592/+2416
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | vio: remove dangly makefile bitsAlan2013-12-031-1/+0
* | | | | | | Merge tag 'pci-v3.14-changes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2014-01-2213-104/+80
|\ \ \ \ \ \ \
| * | | | | | | agp/ati: Use PCI_COMMAND instead of hard-coded 4Bjorn Helgaas2014-01-071-2/+2
| * | | | | | | agp/intel: Use CPU physical address, not bus address, for ioremap()Bjorn Helgaas2014-01-071-7/+7
| * | | | | | | agp/intel: Use pci_bus_address() to get GTTADR bus addressBjorn Helgaas2014-01-072-5/+4
| * | | | | | | agp/intel: Use pci_bus_address() to get MMADR bus addressBjorn Helgaas2014-01-072-9/+5
| * | | | | | | agp/intel: Support 64-bit GMADRYinghai Lu2014-01-072-10/+6
| * | | | | | | agp/intel: Rename gtt_bus_addr to gtt_phys_addrBjorn Helgaas2014-01-071-8/+8
| * | | | | | | agp: Use pci_resource_start() to get CPU physical address for BARBjorn Helgaas2014-01-073-9/+11
| * | | | | | | agp: Support 64-bit APBASEBjorn Helgaas2014-01-0611-60/+43
| | |_|_|/ / / | |/| | | | |
* | | | | | | mm/memblock: remove unnecessary inclusions of bootmem.hGrygorii Strashko2014-01-211-1/+0
* | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2014-01-2116-885/+623
|\ \ \ \ \ \ \
| * | | | | | | tpm/tpm-sysfs: active_show() can be staticFengguang Wu2014-01-061-1/+1
| * | | | | | | tpm: tpm_tis: Fix compile problems with CONFIG_PM_SLEEP/CONFIG_PNPJason Gunthorpe2014-01-061-5/+1
| * | | | | | | tpm: Make tpm-dev allocate a per-file structureJason Gunthorpe2014-01-062-50/+57
| * | | | | | | tpm: Use the ops structure instead of a copy in tpm_vendor_specificJason Gunthorpe2014-01-064-33/+16
| * | | | | | | tpm: Create a tpm_class_ops structure and use it in the driversJason Gunthorpe2014-01-0612-15/+21
| * | | | | | | tpm: Pull all driver sysfs code into tpm-sysfs.cJason Gunthorpe2014-01-0613-307/+72
| * | | | | | | tpm: Move sysfs functions from tpm-interface to tpm-sysfsJason Gunthorpe2014-01-064-274/+314
| * | | | | | | tpm: Pull everything related to /dev/tpmX into tpm-dev.cJason Gunthorpe2014-01-0614-279/+217
| * | | | | | | char: tpm: nuvoton: remove unused variableMichal Nazarewicz2014-01-061-1/+0
| * | | | | | | tpm/tpm_i2c_atmel: fix coccinelle warningsFengguang Wu2014-01-061-1/+1
OpenPOWER on IntegriCloud