summaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'tty-3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gre...Linus Torvalds2014-04-183-5/+14
|\
| * tty: Fix help text of SYNCLINK_CSJean Delvare2014-04-161-1/+1
| * ttyprintk: Allow built as a moduleTakashi Iwai2014-04-162-2/+13
| * ttyprintk: Fix wrong tty_unregister_driver() call in the error pathTakashi Iwai2014-04-161-2/+0
* | Merge branch 'ipmi' (emailed ipmi fixes)Linus Torvalds2014-04-175-152/+251
|\ \
| * | ipmi: boolify some thingsCorey Minyard2014-04-172-37/+35
| * | ipmi: Turn off all activity on an idle ipmi interfaceCorey Minyard2014-04-172-96/+174
| * | ipmi: Turn off default probing of interfacesCorey Minyard2014-04-172-1/+13
| * | ipmi: Reset the KCS timeout when starting error recoveryCorey Minyard2014-04-171-2/+3
| * | ipmi: Fix a race restarting the timerBodo Stroesser2014-04-171-18/+28
| * | Char: ipmi_bt_sm, fix infinite loopJiri Slaby2014-04-171-1/+1
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2014-04-141-5/+5
|\ \ | |/ |/|
| * hwrng: bcm2835 - fix oops when rng h/w is accessed during registrationMatt Porter2014-04-111-5/+5
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2014-04-121-2/+2
|\ \
| * | pipe: kill ->map() and ->unmap()Al Viro2014-04-011-2/+2
* | | Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86Linus Torvalds2014-04-101-1/+1
|\ \ \
| * | | sonypi: Simplify dependenciesJean Delvare2014-04-061-1/+1
* | | | 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
|\| | |