summaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetca...Linus Torvalds2012-04-061-6/+6
|\
| * tile-srom.c driver: minor code cleanupChris Metcalf2012-04-021-6/+6
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-04-051-1/+1
|\ \
| * | APM: fix deadlock in APM_IOC_SUSPEND ioctlNeilBrown2012-04-031-1/+1
* | | Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-04-051-7/+1
|\ \ \
| * | | simple_open: automatically convert to simple_open()Stephen Boyd2012-04-051-7/+1
* | | | drm/i915: disable ppgtt on snb when dmar is enabledDaniel Vetter2012-04-021-1/+0
* | | | drm/i915: add Ivy Bridge GT2 Server entriesEugeni Dodonov2012-04-022-0/+3
| |_|/ |/| |
* | | Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-03-291-4/+1
|\ \ \
| * | | compat: Handle COMPAT_USE_64BIT_TIME in the lp driverH. Peter Anvin2012-02-201-4/+1
* | | | Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-03-284-168/+171
|\ \ \ \ | | |/ / | |/| |
| * | | ipmi: use locks on watchdog timeout set on rebootCorey Minyard2012-03-281-2/+2
| * | | ipmi: simplify lockingCorey Minyard2012-03-281-33/+21
| * | | ipmi: fix message handling during panicsCorey Minyard2012-03-282-64/+56
| * | | ipmi: use a tasklet for handling received messagesCorey Minyard2012-03-282-67/+88
| * | | ipmi: increase KCS timeoutsMatthew Garrett2012-03-281-2/+2
| * | | ipmi: decrease the IPMI message transaction time in interrupt modeSrinivas_Gowda2012-03-281-1/+3
* | | | Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub...Linus Torvalds2012-03-2818-18/+0
|\ \ \ \
| * | | | Remove all #inclusions of asm/system.hDavid Howells2012-03-2818-18/+0
* | | | | Merge git://www.linux-watchdog.org/linux-watchdogLinus Torvalds2012-03-281-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | watchdog: nowayout is boolWim Van Sebroeck2012-03-271-2/+2
* | | | | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-03-271-0/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | ARM: OMAP: Remove plat/io.h by splitting it into mach/io.h and mach/hardware.hTony Lindgren2012-02-241-0/+2
| | |/ / | |/| |
* | | | Merge branch 'amba' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-03-231-12/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | ARM: 7362/1: AMBA: Add module_amba_driver() helper macro for amba_driverviresh kumar2012-03-161-12/+1
* | | | 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