summaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'origin/master' into nextBenjamin Herrenschmidt2009-06-175-60/+213
|\
| * Merge branch 'serial'Linus Torvalds2009-06-164-17/+50
| |\
| | * tty: fix sanity checkAlan Cox2009-06-161-0/+2
| | * pty: Narrow the race on ldisc lockingAlan Cox2009-06-161-13/+40
| | * tty: fix unused warning when TCGETX is not definedMike Frysinger2009-06-161-2/+3
| | * ldisc: debug aidsAlan Cox2009-06-161-0/+1
| | * ldisc: Make sure the ldisc isn't active when we close itAlan Cox2009-06-161-0/+2
| | * tty: Fix leaks introduced by the shift to separate ldisc objectsAlan Cox2009-06-161-2/+4
| * | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6Linus Torvalds2009-06-161-43/+161
| |\ \
| | * | [S390] pm: hvc_iucv power management callbacksHendrik Brueckner2009-06-161-43/+161
| | |/
| * | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2009-06-161-132/+164
| |\ \
| * | | tty: Fix leaks introduced by the shift to separate ldisc objectsAlan Cox2009-06-161-2/+4
| * | | pty: Narrow the race on ldisc lockingAlan Cox2009-06-161-3/+3
| | |/ | |/|
| * | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2009-06-151-1/+1
| |\ \
* | | | drivers/hvc: Add missing __devexit_p()Mike Frysinger2009-06-163-3/+3
| |_|/ |/| |
* | | ps3flash: Always read chunks of 256 KiB, and cache themGeert Uytterhoeven2009-06-151-30/+17
* | | ps3flash: Cache the last accessed FLASH chunkGeert Uytterhoeven2009-06-151-105/+104
* | | ps3: Replace direct file operations by callbackGeert Uytterhoeven2009-06-151-24/+70
* | | ps3flash: Use ps3_system_bus_[gs]et_drvdata() instead of direct accessGeert Uytterhoeven2009-06-151-6/+6
* | | Merge commit 'origin/master' into nextBenjamin Herrenschmidt2009-06-1512-54/+330
|\ \ \ | |/ / | | / | |/ |/|
| * Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2009-06-142-2/+2
| |\
| | * trivial: Kconfig: .ko is normally not included in module namesPavel Machek2009-06-121-1/+1
| | * trivial: typo (en|dis|avail|remove)bale -> (en|dis|avail|remove)ableThadeu Lima de Souza Cascardo2009-06-121-1/+1
| * | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-06-143-0/+260
| |\ \
| | * \ Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khil...Russell King2009-05-293-8/+10
| | |\ \
| | * \ \ Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/...Russell King2009-05-233-9/+20
| | |\ \ \
| | * | | | i.MX31: Add hw-random for RNGAAlan Carvalho de Assis2009-05-073-0/+260
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2009-06-134-23/+22
| |\ \ \ \ \
| | * | | | | hwrng: timeriomem - Fix potential oops (request_mem_region/__devinit)Alexander Clouter2009-06-031-20/+6
| | * | | | | hwrng: via_rng - Support VIA Nano hardware RNG on X86_64 buildsHarald Welte2009-06-021-1/+1
| | * | | | | hwrng: via_rng - Support VIA Nano hardware RNGHarald Welte2009-06-021-0/+13
| | * | | | | hwrng: via_rng - The VIA Hardware RNG driver is for the CPU, not ChipsetHarald Welte2009-06-021-1/+1
| | * | | | | hwrng: omap - Move probe function to .devinit.textUwe Kleine-König2009-06-021-1/+1
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/air...Linus Torvalds2009-06-121-1/+15
| |\ \ \ \ \
| | * | | | | agp/intel: Add support for new chipsetsZhenyu Wang2009-06-051-1/+15
| | |/ / / /
| * | | | | Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblazeLinus Torvalds2009-06-121-1/+1
| |\ \ \ \ \
| | * | | | | microblaze: Kconfig: Enable drivers for MicroblazeMichal Simek2009-05-211-1/+1
| * | | | | | Merge branch 'for-linus' of git://linux-arm.org/linux-2.6Linus Torvalds2009-06-121-1/+0
| |\ \ \ \ \ \
| | * | | | | | kmemleak: Remove the kmemleak.h include in drivers/char/vt.cCatalin Marinas2009-06-121-1/+0
| | | |_|_|_|/ | | |/| | | |
| * | | | | | virtio: handle short buffers in virtio_rng.Rusty Russell2009-06-121-8/+16
| * | | | | | virtio: find_vqs/del_vqs virtio operationsMichael S. Tsirkin2009-06-122-18/+14
| * | | | | | virtio: add names to virtqueue struct, mapping from devices to queues.Rusty Russell2009-06-122-3/+3
| |/ / / / /
* | | | | | Merge commit 'origin/master' into nextBenjamin Herrenschmidt2009-06-1231-589/+1172
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'for-linus' of git://linux-arm.org/linux-2.6Linus Torvalds2009-06-111-0/+1
| |\ \ \ \ \
| | * | | | | kmemleak: Remove some of the kmemleak false positivesCatalin Marinas2009-06-111-0/+7
| * | | | | | Merge branch 'perfcounters-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2009-06-111-0/+2
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'linus' into perfcounters/coreIngo Molnar2009-06-113-6/+5
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Merge branch 'linus' into perfcounters/coreIngo Molnar2009-06-061-0/+3
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'linus' into perfcounters/coreIngo Molnar2009-06-013-8/+10
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Merge commit 'v2.6.30-rc6' into perfcounters/coreIngo Molnar2009-05-183-9/+20
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
OpenPOWER on IntegriCloud