summaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm' (aka "Andrew's patch-bomb, take two")Linus Torvalds2012-01-121-12/+12
|\
| * ramoops: update parameters only after successful initKees Cook2012-01-121-8/+9
| * ramoops: fix use of rounddown_pow_of_two()Marco Stornelli2012-01-121-2/+2
| * kexec: remove KMSG_DUMP_KEXECWANG Cong2012-01-121-2/+1
* | Merge tag 'to-linus' of git://github.com/rustyrussell/linuxLinus Torvalds2012-01-122-32/+110
|\ \ | |/ |/|
| * virtio: console: Disable callbacks for virtqueues at start of S4 freezeAmit Shah2012-01-121-0/+8
| * virtio: console: Add freeze and restore handlers to support S4Amit Shah2012-01-121-0/+58
| * virtio: console: Move vq and vq buf removal into separate functionsAmit Shah2012-01-121-28/+40
| * virtio: rename virtqueue_add_buf_gfp to virtqueue_add_bufRusty Russell2012-01-122-4/+4
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2012-01-107-80/+7
|\ \
| * | char: hw_random: convert drivers/char/hw_random/* to use module_platform_driv...Axel Lin2011-11-307-80/+7
* | | Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-securityLinus Torvalds2012-01-104-80/+152
|\ \ \ | |_|/ |/| |
| * | Merge branch 'next' into for-linusJames Morris2012-01-094-80/+152
| |\ \
| | * \ Merge branch 'for-james' of git://github.com/srajiv/tpm into nextJames Morris2011-11-174-80/+152
| | |\ \
| | | * | TPM: fix transmit_cmd error logicRajiv Andrade2011-11-163-10/+9
| | | * | TPM: NSC and TIS drivers X86 dependency fixRajiv Andrade2011-11-161-0/+2
| | | * | TPM: Export wait_for_stat for other vendor specific driversRajiv Andrade2011-11-163-53/+55
| | | * | TPM: Use vendor specific function for status probeRajiv Andrade2011-11-161-5/+5
| | | * | tpm_tis: add delay after aborting commandStefan Berger2011-11-161-0/+3
| | | * | tpm_tis: Check return code from getting timeouts/durationsStefan Berger2011-11-161-1/+5
| | | * | tpm: Introduce function to poll for result of self testStefan Berger2011-11-163-6/+51
| | | * | tpm: Cleanup tpm_continue_selftestStefan Berger2011-11-162-8/+24
| | | * | tpm: Have tpm_get_timeouts return an error codeStefan Berger2011-11-162-5/+6
* | | | | Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2012-01-101-4/+4
|\ \ \ \ \
| * | | | | agp: Fix multi-line warning message whitespaceTormod Volden2012-01-061-4/+4
* | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-01-081-1/+1
|\ \ \ \ \ \
| * | | | | | treewide: Fix typos in various parts of the kernel, and fix some comments.Justin P. Mattock2011-12-021-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/vi...Linus Torvalds2012-01-084-5/+5
|\ \ \ \ \ \
| * | | | | | switch device_get_devnode() and ->devnode() to umode_t *Al Viro2012-01-034-5/+5
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kern...Linus Torvalds2012-01-061-0/+2
|\ \ \ \ \ \
| * | | | | | hwrng: nomadik: Enable module alias autogeneration for AMBA driversDave Martin2011-11-221-0/+2
| | |/ / / / | |/| | | |
* | | | | | random: Use arch_get_random_int instead of cycle counter if availLinus Torvalds2011-12-291-2/+6
| |/ / / / |/| | | |
* | | | | ipmi_watchdog: restore settings when BMC resetCorey Minyard2011-12-201-3/+38
| |/ / / |/| | |
* | | | fix typo/thinko in get_random_bytes()Luck, Tony2011-11-171-1/+1
|/ / /
* | | agp: iommu_gfx_mapped only available if CONFIG_INTEL_IOMMU is setKeith Packard2011-11-081-2/+3
* | | drm/i915: fix if statement (bogus semi-colon)Dan Carpenter2011-11-081-1/+1
| |/ |/|
* | Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-066-0/+6
|\ \
| * | drivers/char: Fix implicit use of err.h in ramoops.cPaul Gortmaker2011-10-311-0/+1
| * | drivers/char: Add export.h for EXPORT_SYMBOL/THIS_MODULE as requiredPaul Gortmaker2011-10-312-0/+2
| * | drivers/char: Add module.h to those who were using it implicitlyPaul Gortmaker2011-10-313-0/+3
* | | Merge branch 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...Linus Torvalds2011-11-021-2/+4
|\ \ \
| * | | [IA64] agp/hp-agp: Allow binding user memory to the AGP GARTÉmeric Maschino2011-08-231-2/+4
* | | | Merge git://github.com/rustyrussell/linuxLinus Torvalds2011-11-021-41/+79
|\ \ \ \
| * | | | virtio: console: wait for first console port for early console outputChristian Borntraeger2011-11-021-0/+20
| * | | | virtio: console: add port stats for bytes received, sent and discardedAmit Shah2011-11-021-0/+24
| * | | | virtio: console: make discard_port_data() use get_inbuf()Amit Shah2011-11-021-10/+5
| * | | | virtio: console: rename variableAmit Shah2011-11-021-6/+5
| * | | | virtio: console: make get_inbuf() return port->inbuf if presentAmit Shah2011-11-021-14/+8
| * | | | virtio: console: Fix return type for get_inbuf()Amit Shah2011-11-021-1/+1
| * | | | virtio: console: Use wait_event_freezable instead of _interruptibleAmit Shah2011-11-021-4/+5
OpenPOWER on IntegriCloud