summaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/fre...Linus Torvalds2010-05-2412-57/+144
|\
| * drivers: Push down BKL into various driversArnd Bergmann2010-05-1712-57/+144
* | Merge remote branch 'origin' into secretlab/next-devicetreeGrant Likely2010-05-2242-2744/+5571
|\ \
| * \ Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/...Linus Torvalds2010-05-212-326/+380
| |\ \
| | * | drivers/char: Eliminate use after freeJulia Lawall2010-05-191-4/+4
| | * | virtio: console: Accept console size along with resize control messageAmit Shah2010-05-191-1/+12
| | * | virtio: console: Store each console's size in the console structureAmit Shah2010-05-191-12/+31
| | * | virtio: console: Resize console port 0 on config intr only if multiport is offAmit Shah2010-05-191-7/+10
| | * | virtio: console: Add support for nonblocking write()sAmit Shah2010-05-191-8/+111
| | * | virtio: console: Rename wait_is_over() to will_read_block()Amit Shah2010-05-191-3/+3
| | * | virtio: console: Don't always create a port 0 if using multiportAmit Shah2010-05-191-17/+15
| | * | virtio: console: Use a control message to add portsAmit Shah2010-05-191-44/+33
| | * | virtio: console: Move code around for future patchesAmit Shah2010-05-191-133/+133
| | * | virtio: console: Remove config work handlerAmit Shah2010-05-191-63/+1
| | * | virtio: console: Don't call hvc_remove() on unplugging console portsAmit Shah2010-05-191-0/+11
| | * | virtio: console: Return -EPIPE to hvc_console if we lost the connectionAmit Shah2010-05-191-2/+6
| | * | virtio: console: Let host know of port or device add failuresAmit Shah2010-05-191-0/+5
| | * | virtio: console: Add a __send_control_msg() that can send messages without a ...Amit Shah2010-05-191-5/+11
| | * | virtio: Revert "virtio: disable multiport console support."Amit Shah2010-05-191-41/+8
| | * | virtio-rng: use virtqueue_xxx wrappersMichael S. Tsirkin2010-05-191-3/+3
| | * | virtio_console: use virtqueue_xxx wrappersMichael S. Tsirkin2010-05-191-16/+16
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2010-05-211-7/+3
| |\ \ \
| | * | | random: simplify fips modeMatt Mackall2010-05-201-7/+3
| * | | | Merge branch 'drm-for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2010-05-2113-1876/+1917
| |\ \ \ \
| | * | | | amd64-agp: Probe unknown AGP devices the right wayBen Hutchings2010-05-191-12/+15
| | * | | | sis-agp: Remove SIS 760, handled by amd64-agpBen Hutchings2010-05-191-8/+0
| | * | | | Merge remote branch 'origin/master' into drm-intel-nextEric Anholt2010-05-106-9/+21
| | |\| | |
| | * | | | agp: use scratch page on memory remove and at GATT creation V4Jerome Glisse2010-04-239-4/+44
| | * | | | agp/intel: put back check that we have a driver for the bridge.Dave Airlie2010-04-201-0/+8
| | * | | | Merge remote branch 'anholt/drm-intel-next' of /home/airlied/kernel/drm-next ...Dave Airlie2010-04-205-1858/+1856
| | |\ \ \ \
| | | * | | | agp/intel-gtt: kill previous_size assignmentsDaniel Vetter2010-04-181-8/+5
| | | * | | | agp/intel-gtt: kill intel_i830_tlbflushDaniel Vetter2010-04-181-16/+0
| | | * | | | agp/intel: split out gmch/gtt probe, part 1Daniel Vetter2010-04-181-29/+44
| | | * | | | agp/intel: kill mutli_gmch_chipDaniel Vetter2010-04-181-55/+52
| | | * | | | agp/intel: uncoditionally reconfigure driver on resumeDaniel Vetter2010-04-181-16/+1
| | | * | | | agp/intel: split out the GTT supportDaniel Vetter2010-04-182-1523/+1537
| | | * | | | agp/intel: introduce intel-agp.h header fileDaniel Vetter2010-04-184-235/+241
| * | | | | | serial: Tidy REMOTE_DEBUGChristoph Egger2010-05-211-222/+1
| * | | | | | serial: isicomm: handle running out of slotsDan Carpenter2010-05-211-1/+7
| * | | | | | tty: fix obsolete comment on tty_insert_flip_string_fixed_flagJohan Hovold2010-05-211-1/+1
| * | | | | | tty: n_gsm: depends on NETRandy Dunlap2010-05-211-0/+1
| * | | | | | tty: n_gsm line disciplineAlan Cox2010-05-213-1/+2772
| * | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2010-05-202-200/+368
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge commit 'v2.6.34' into nextDmitry Torokhov2010-05-198-12/+22
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Input: keyboard - fix formatting issuesDmitry Torokhov2010-04-131-131/+147
| | * | | | | | Input: keyboard - switch to using pr_err() and friendsDmitry Torokhov2010-04-131-4/+7
| | * | | | | | Input: implement SysRq as a separate input handlerDmitry Torokhov2010-04-132-67/+216
| * | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2010-05-202-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | agp: use NULL instead of 0 when pointer is neededBill Pemberton2010-05-111-1/+1
| | * | | | | | | Merge branch 'master' into for-nextJiri Kosina2010-04-2364-90/+204
| | |\ \ \ \ \ \ \