summaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Expand)AuthorAgeFilesLines
* Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAPUwe Kleine-König2014-04-071-1/+1
* Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...Linus Torvalds2014-04-051-3/+3
|\
| * Merge tag 'qcom-drivers-for-3.15' of git://git.kernel.org/pub/scm/linux/kerne...Arnd Bergmann2014-02-251-3/+3
| |\
| | * hwrng: msm: switch Kconfig to ARCH_QCOM dependsKumar Gala2014-02-211-3/+3
* | | Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2014-04-041-108/+136
|\ \ \
| * | | random: Add arch_has_random[_seed]()H. Peter Anvin2014-03-191-0/+3
| * | | random: If we have arch_get_random_seed*(), try it before blockingH. Peter Anvin2014-03-191-0/+33
| * | | random: Use arch_get_random_seed*() at init time and once a secondH. Peter Anvin2014-03-191-4/+20
| * | | random: use the architectural HWRNG for the SHA's IV in extract_buf()Theodore Ts'o2014-03-191-8/+8
| * | | random: clarify bits/bytes in wakeup thresholdsGreg Price2014-03-191-17/+17
| * | | random: entropy_bytes is actually bitsGreg Price2014-03-191-3/+3
| * | | random: simplify accounting codeGreg Price2014-03-191-17/+10
| * | | random: tighten bound on random_read_wakeup_threshGreg Price2014-03-191-1/+1
| * | | random: forget lock in lockless accountingGreg Price2014-03-191-4/+0
| * | | random: simplify accounting logicGreg Price2014-03-191-8/+4
| * | | random: fix comment on "account"Greg Price2014-03-191-10/+21
| * | | random: simplify loop in random_readGreg Price2014-03-191-39/+18
| * | | random: fix description of get_random_bytesGreg Price2014-03-191-2/+3
| * | | random: fix comment on proc_do_uuidGreg Price2014-03-191-4/+4
| * | | random: fix typos / spelling errors in commentsGreg Price2014-03-191-3/+3
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2014-04-036-87/+36
|\ \ \ \
| * | | | hwrng: add randomness to system from rng sourcesKees Cook2014-03-101-0/+7
| * | | | hwrng: timeriomem - Use devm_*() functionsJingoo Han2014-03-101-30/+10
| * | | | hwrng: nomadik - Use devm_*() functionsJingoo Han2014-03-101-9/+4
| * | | | hwrng: pixocell - Use devm_clk_get()Jingoo Han2014-03-101-6/+2
| * | | | hwrng: omap3-rom - Use devm_clk_get()Jingoo Han2014-03-101-2/+1
| * | | | hwrng: atmel - Use devm_clk_get()Jingoo Han2014-03-101-6/+2
| * | | | hwrng: pixocell - Use devm_ioremap_resource()Jingoo Han2014-02-271-16/+3
| * | | | hwrng: atmel - Use devm_ioremap_resource()Jingoo Han2014-02-271-11/+4
| * | | | hwrng: cleanup in hwrng_register()Dan Carpenter2014-02-091-7/+3
| | |_|/ | |/| |
* | | | Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2014-04-021-2/+1
|\ \ \ \
| * | | | virtio-rng: don't crash if virtqueue is broken.Rusty Russell2014-03-131-2/+1
| | |_|/ | |/| |
* | | | Merge 3.14-rc3 into char-misc-nextGreg Kroah-Hartman2014-02-183-7/+5
|\ \ \ \ | |/ / /
| * | | Merge tag 'char-misc-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2014-02-142-1/+2
| |\ \ \ | | |_|/ | |/| |
| | * | raw: set range for MAX_RAW_DEVSPaul Bolle2014-02-071-0/+1
| | * | raw: test against runtime value of max_raw_minorsPaul Bolle2014-02-071-1/+1
| | |/
| * | fix a kmap leak in virtio_consoleAl Viro2014-02-091-6/+3
| |/
* | /dev/mem: handle out-of-bounds read/writePetr Tesarik2014-02-151-0/+6
* | drivers/char: delete non-required instances of include <linux/init.h>Paul Gortmaker2014-02-0715-15/+0
|/
* 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
OpenPOWER on IntegriCloud