summaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-james' of git://tpmdd.git.sourceforge.net/gitroot/tpmdd/tpm...James Morris2011-02-113-3/+21
|\
| * tpm_tis: Use timeouts returned from TPMStefan Berger2011-02-113-3/+21
* | char/ipmi: fix OOPS caused by pnp_unregister_driver on unregistered driverCorey Minyard2011-02-101-10/+2
* | Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gre...Linus Torvalds2011-02-102-0/+1851
|\ \ | |/ |/|
| * virtio: console: Move file back to drivers/char/Amit Shah2011-02-032-0/+1839
* | agp: ensure GART has an address before enabling itStephen Kitt2011-02-041-11/+16
* | Revert "agp: AMD AGP is used on UP1100 & UP1500 alpha boxen"Matt Turner2011-02-041-1/+1
* | amd-k7-agp: remove non-x86 codeMatt Turner2011-02-041-19/+0
|/
* console: rename acquire/release_console_sem() to console_lock/unlock()Torben Hohn2011-01-261-4/+4
* Merge remote branch 'linus/master' into drm-intel-fixesChris Wilson2011-01-2419-8807/+15
|\
| * tpm: fix panic caused by "tpm: Autodetect itpm devices"Olof Johansson2011-01-241-3/+3
| * TPM: Long default timeout fixRajiv Andrade2011-01-241-4/+6
| * Merge branch 'akpm'Linus Torvalds2011-01-201-5/+5
| |\
| | * kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERTDavid Rientjes2011-01-201-5/+5
| * | Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gre...Linus Torvalds2011-01-2017-8795/+1
| |\ \ | | |/ | |/|
| | * tty: move drivers/serial/ to drivers/tty/serial/Greg Kroah-Hartman2011-01-131-1/+1
| | * tty: move hvc drivers to drivers/tty/hvc/Greg Kroah-Hartman2011-01-1316-8794/+0
* | | drm/i915,agp/intel: Do not clear stolen entriesChris Wilson2011-01-241-10/+9
|/ /
* | Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2011-01-142-3/+3
|\ \
| * | agp/intel: Fix device names of i845 and 845GOswald Buddenhagen2011-01-142-3/+3
* | | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Linus Torvalds2011-01-132-5/+45
|\ \ \
| * \ \ Merge branch 'ipmi' into releaseLen Brown2011-01-122-4/+43
| |\ \ \
| | * | | IPMI: Add one interface to get more info of low-level IPMI deviceZhao Yakui2010-12-142-4/+43
| * | | | ACPICA: New GPE handler callback definitionLin Ming2011-01-121-1/+2
* | | | | Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2011-01-131-10/+4
|\ \ \ \ \
| * \ \ \ \ Merge branch 'cleanup-bd_claim' of git://git.kernel.org/pub/scm/linux/kernel/...Jens Axboe2010-11-271-10/+4
| |\ \ \ \ \
| | * | | | | block: make blkdev_get/put() handle exclusive accessTejun Heo2010-11-131-10/+4
* | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2011-01-131-4/+6
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | hwrng: via_rng - Fix memory scribbling on some CPUsHerbert Xu2011-01-071-2/+5
| * | | | | | hwrng: via_rng - Fix asm constraintsHerbert Xu2011-01-071-2/+1
* | | | | | | ramoops: fix types, remove typecastsAndrew Morton2011-01-131-4/+4
* | | | | | | cs5535: deprecate older cs5535_gpio driverAndres Salomon2011-01-133-269/+0
* | | | | | | kmsg_dump: constrain mtdoops and ramoops to perform their actions only for KM...Seiji Aguchi2011-01-131-0/+5
| |_|_|_|_|/ |/| | | | |
* | | | | | i915/gtt: fix ordering causing DMAR errors on object teardown.Dave Airlie2011-01-121-2/+2
* | | | | | i915/gtt: fix ordering issues with status setup and DMARDave Airlie2011-01-121-2/+2
* | | | | | Merge branch 'drm-intel-fixes' of ssh://master.kernel.org/pub/scm/linux/kerne...Dave Airlie2011-01-122-0/+11
|\ \ \ \ \ \
| * | | | | | agp/intel: Flush the chipset write buffers when changing GTT baseChris Wilson2011-01-112-0/+11
* | | | | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2011-01-111-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'gcl/next' into nextBenjamin Herrenschmidt2011-01-113-9/+44
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | drivers/char/hvc_vio: Use static const char arraysJoe Perches2010-11-291-1/+1
* | | | | | | | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-01-111-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git...Ingo Molnar2011-01-091-17/+16
| |\ \ \ \ \ \ \
| * | | | | | | | x86: Convert some devices to use DIE_NMIUNKNOWNDon Zickus2011-01-071-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-01-108-472/+363
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-nextDave Airlie2011-01-051-5/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | Merge branch 'drm-intel-fixes' into drm-intel-nextChris Wilson2010-12-141-2/+9
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'drm-intel-fixes' into drm-intel-nextChris Wilson2010-12-051-2/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'drm-intel-fixes' into drm-intel-nextChris Wilson2010-12-022-28/+33
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | agp/intel: Remove duplicate constChris Wilson2010-11-231-1/+1
| * | | | | | | | | | intel-gtt: export api for drm/i915Daniel Vetter2010-11-231-52/+68
OpenPOWER on IntegriCloud