summaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Expand)AuthorAgeFilesLines
*---. Merge branches 'defcfg', 'drivers' and 'cyberpro-next' of master.kernel.org:/...Linus Torvalds2011-03-171-1/+1
|\ \ \
| | | \
| | | \
| | | \
| | | \
| | *---. \ Merge branches 'aaci', 'mmci-dma', 'pl' and 'pl011' into driversRussell King2011-03-1714-118/+1957
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | | * | ARM: amba: make probe() functions take const id tablesRussell King2011-02-231-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2011-03-164-141/+83
|\ \ \ \ \
| * | | | | dt: xilinx_hwicap: merge platform and of_platform driver bindingsGrant Likely2011-02-281-82/+47
| * | | | | ipmi: convert OF driver to platform driverRob Herring2011-02-281-47/+23
| * | | | | dt/sparc: Eliminate users of of_platform_{,un}register_driverGrant Likely2011-02-281-7/+9
| * | | | | dt/powerpc: Eliminate users of of_platform_{,un}register_driverGrant Likely2011-02-281-5/+4
* | | | | | Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2011-03-16108-93082/+9
|\ \ \ \ \ \
| * | | | | | tty: move cd1865.h to drivers/staging/tty/Arnd Bergmann2011-03-071-263/+0
| * | | | | | Staging: tty: fix build with epca.c driverGreg Kroah-Hartman2011-03-073-278/+0
| * | | | | | pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()Axel Lin2011-03-011-2/+1
| * | | | | | tty: forgot to remove ipwireless from drivers/char/pcmcia/MakefileGreg Kroah-Hartman2011-02-251-2/+0
| * | | | | | Merge 2.6.38-rc6 into tty-nextGreg Kroah-Hartman2011-02-246-41/+1870
| |\| | | | |
| * | | | | | tty: move obsolete and broken generic_serial drivers to drivers/staging/gener...Greg Kroah-Hartman2011-02-2251-20308/+0
| * | | | | | tty: move obsolete and broken tty drivers to drivers/staging/tty/Greg Kroah-Hartman2011-02-2227-28968/+0
| * | | | | | tty: move ipwireless driver from drivers/char/pcmcia/ to drivers/tty/Greg Kroah-Hartman2011-02-2210-3632/+0
| * | | | | | tty: move a number of tty drivers from drivers/char/ to drivers/tty/Greg Kroah-Hartman2011-02-2217-39363/+0
| * | | | | | tty: move Kconfig entries into drivers/tty from drivers/charGreg Kroah-Hartman2011-02-221-252/+2
| * | | | | | tty: now phase out the ioctl file pointer for goodAlan Cox2011-02-1722-40/+36
| * | | | | | tiocmset: kill the file pointer argumentAlan Cox2011-02-1720-39/+38
| * | | | | | tiocmget: kill off the passing of the struct fileAlan Cox2011-02-1720-27/+27
| * | | | | | hvc: add Blackfin JTAG console supportMike Frysinger2011-02-171-0/+9
| | |_|_|/ / | |/| | | |
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2011-03-165-11/+237
|\ \ \ \ \ \
| * | | | | | random: update interface comments to reflect realityJarod Wilson2011-02-211-3/+10
| * | | | | | hwrng: omap - Convert release_resource to release_region/release_mem_regionJulia Lawall2011-02-161-8/+6
| * | | | | | hwrng: pixocell - add support for picoxcell TRNGJamie Iles2011-01-233-0/+221
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2011-03-151-11/+19
|\ \ \ \ \ \
| * | | | | | posix-timers: Cleanup namespaceThomas Gleixner2011-02-021-1/+1
| * | | | | | posix-timers: Remove useless res field from k_clockThomas Gleixner2011-02-021-3/+2
| * | | | | | posix-timers: Convert clock_getres() to clockid_to_kclock()Thomas Gleixner2011-02-021-0/+10
| * | | | | | posix-timers: Convert clock_nanosleep to clockid_to_kclock()Thomas Gleixner2011-02-021-1/+0
| * | | | | | posix-timers: Cleanup struct initializersThomas Gleixner2011-02-021-7/+7
| * | | | | | time: Correct the *settime* parametersRichard Cochran2011-02-021-1/+1
| | |/ / / / | |/| | | |
* | | | | | ipmi: Fix IPMI errors due to timing problemsDoe, YiCheng2011-03-101-0/+8
| |_|_|_|/ |/| | | |
* | | | | virtio: console: Don't access vqs if device was unpluggedAmit Shah2011-03-061-0/+8
* | | | | Revert "TPM: Long default timeout fix"Linus Torvalds2011-03-011-6/+4
* | | | | Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/g...Dave Airlie2011-02-242-35/+22
|\ \ \ \ \
| * | | | | agp/intel: Experiment with a 855GM GWB bitChris Wilson2011-02-222-35/+22
| | |_|/ / | |/| | |
* | | | | amd64-agp: fix crash at second module loadFlorian Mickler2011-02-231-2/+7
* | | | | Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/...Linus Torvalds2011-02-222-22/+33
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | cm4000_cs: Fix undefined ops warningAlan Cox2011-02-191-2/+1
| * | | | drivers/char/pcmcia/ipwireless/main.c: Convert release_resource to release_re...Julia Lawall2011-02-191-20/+32
| | |_|/ | |/| |
* / | | Revert "tpm_tis: Use timeouts returned from TPM"Linus Torvalds2011-02-203-21/+3
|/ / /
* | | 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