summaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2012-03-222-5/+6
|\
| * Merge remote-tracking branch 'airlied/drm-fixes' into drm-intel-next-queuedDaniel Vetter2012-02-1030-235/+371
| |\
| * | agp/intel-gtt: export the gtt pagetable iomappingDaniel Vetter2012-02-091-0/+1
| * | agp/intel-gtt: export the scratch page dma addressDaniel Vetter2012-02-091-5/+4
| * | agp/intel: Add pci id for hostbridge from has/qemuBen Widawsky2012-01-171-0/+1
* | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2012-03-211-1041/+0
|\ \ \
| * | | powerpc: Remove some of the legacy iSeries specific device driversStephen Rothwell2012-03-161-1041/+0
| | |/ | |/|
* | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2012-03-214-9/+14
|\ \ \
| * | | TPM: Zero buffer whole after copying to userspaceTim Gardner2012-02-141-1/+2
| * | | tpm_tis: Clean up after module_param cleanupStefan Berger2012-02-141-4/+5
| * | | tpm_tis: Only probe iTPMsStefan Berger2012-02-142-3/+7
| * | | Merge branch 'next-queue' into nextJames Morris2012-02-091-1/+0
| |\ \ \ | | |/ / | |/| |
| | * | ima: fix Kconfig dependenciesFabio Estevam2012-01-191-1/+0
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2012-03-211-4/+1
|\ \ \ \
| * | | | hwrng: tx4939 - use devm_request_and_ioremapJulia Lawall2012-01-131-4/+1
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-03-203-8/+8
|\ \ \ \ \
| * | | | | Revert "char: Fix typo in viotape.c"Jiri Kosina2012-03-161-1/+1
| * | | | | tpm_tis: fix tis_lock with respect to RCUJiri Kosina2012-03-051-5/+5
| * | | | | char: Fix typo in tlclk.cMasanari Iida2012-02-091-1/+1
| * | | | | char: Fix typo in viotape.cMasanari Iida2012-02-091-1/+1
| * | | | | Merge branch 'master' into for-nextJiri Kosina2012-02-0324-228/+323
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | drivers/char: comment fix: CMOS RTC update code is now in kernel/time/ntp.cMichael Witten2012-02-032-3/+3
* | | | | | Merge tag 'tty-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/ttyLinus Torvalds2012-03-205-286/+1
|\ \ \ \ \ \
| * | | | | | TTY: remove unneeded tty->index checksJiri Slaby2012-03-081-1/+1
| * | | | | | TTY: remove re-assignments to tty_driver membersJiri Slaby2012-03-082-3/+0
| * | | | | | tty: delete briq_panel.c driverGreg Kroah-Hartman2012-03-083-282/+0
| | |/ / / / | |/| | | |
* | | | | | Merge tag 'char-misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gr...Linus Torvalds2012-03-203-3/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | char/ramoops: included linux/err.h twiceDanny Kukawka2012-02-241-1/+0
| * | | | | char: Fix typo in tlclk.cMasanari Iida2012-02-091-1/+1
| * | | | | char: Fix typo in viotape.cMasanari Iida2012-02-091-1/+1
* | | | | | agp: fix scratch page cleanupMichal Kubecek2012-01-261-6/+6
|/ / / / /
* | | | | tpm: fix (ACPI S3) suspend regressionStefan Berger2012-01-182-0/+12
* | | | | Merge branch 'x86/rdrand' of git://git.kernel.org/pub/scm/linux/kernel/git/ti...Linus Torvalds2012-01-161-0/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | random: Adjust the number of loops when initializingH. Peter Anvin2012-01-161-1/+1
| * | | | random: Use arch-specific RNG to initialize the entropy storeTheodore Ts'o2012-01-161-0/+6
* | | | | Merge tag 'for-linus' of git://github.com/rustyrussell/linuxLinus Torvalds2012-01-149-14/+14
|\ \ \ \ \
| * | | | | module_param: make bool parameters really bool (drivers & misc)Rusty Russell2012-01-139-14/+14
* | | | | | 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
| |\ \ \ \ \