summaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tileLinus Torvalds2010-08-082-0/+68
|\
| * Merge branch 'master' into for-linusChris Metcalf2010-08-0614-52/+220
| |\
| * \ Merge branch 'master' into for-linusChris Metcalf2010-07-064-11/+27
| |\ \
| * | | arch/tile: catch up on various minor cleanups.Chris Metcalf2010-07-061-9/+9
| * | | Merge branch 'master' into for-linusChris Metcalf2010-06-251-1/+1
| |\ \ \
| * \ \ \ Merge branch 'master' into for-linusChris Metcalf2010-06-054-6/+10
| |\ \ \ \
| * | | | | arch/tile: core support for Tilera 32-bit chips.Chris Metcalf2010-06-042-0/+68
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2010-08-066-94/+51
|\ \ \ \ \ \
| * | | | | | pcmcia: use struct resource for PCMCIA devices, part 2Dominik Brodowski2010-08-031-11/+2
| * | | | | | pcmcia: remove memreq_tDominik Brodowski2010-08-031-12/+2
| * | | | | | pcmcia: do not use io_req_t when calling pcmcia_request_io()Dominik Brodowski2010-08-034-42/+26
| * | | | | | pcmcia: do not use io_req_t after call to pcmcia_request_io()Dominik Brodowski2010-08-034-24/+21
| * | | | | | pcmcia: remove cs_types.hDominik Brodowski2010-07-305-5/+0
* | | | | | | Fix init ordering of /dev/console vs callers of modprobeDavid Howells2010-08-062-3/+3
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2010-08-054-31/+106
|\ \ \ \ \ \
| * | | | | | agp: intel-agp: do not use PCI resources before pci_enable_device()Kulikov Vasiliy2010-08-051-11/+11
| * | | | | | agp: efficeon-agp: do not use PCI resources before pci_enable_device()Kulikov Vasiliy2010-08-051-11/+11
| * | | | | | drm/agp/i915: trim stolen space to 32MJesse Barnes2010-08-011-1/+10
| * | | | | | agp/intel: Destroy the scatterlist on allocation failureChris Wilson2010-08-011-5/+8
| * | | | | | Merge remote branch 'origin/master' into drm-intel-nextEric Anholt2010-08-012-6/+16
| |\ \ \ \ \ \
| * | | | | | | agp/intel: Add actual definitions of the Sandybridge PTE caching bits.Zhenyu Wang2010-08-012-1/+7
| * | | | | | | agp/intel: Support the extended physical addressing bits on Sandybridge.Zhenyu Wang2010-08-012-2/+45
| * | | | | | | intel_agp: Don't oops with zero stolen memoryOndrej Zary2010-08-011-0/+14
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'kms-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwe...Linus Torvalds2010-08-051-0/+78
|\ \ \ \ \ \ \
| * | | | | | | vt,console,kdb: automatically set kdb LINES variableJason Wessel2010-08-051-0/+17
| * | | | | | | vt,console,kdb: implement atomic console enter/leave functionsJesse Barnes2010-08-051-0/+61
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2010-08-052-2/+3
|\ \ \ \ \ \ \
| * | | | | | | of/address: Clean up function declarationsGrant Likely2010-08-011-0/+1
| * | | | | | | of/platform: remove all of_bus_type and of_platform_bus_type referencesGrant Likely2010-07-241-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2010-08-052-8/+8
|\ \ \ \ \ \ \
| * | | | | | | Merge commit 'gcl/next' into nextBenjamin Herrenschmidt2010-08-041-1/+1
| |\| | | | | |
| * | | | | | | hvc_console: use "*_console" nomenclature to avoid modpost warning.Chris Metcalf2010-07-092-8/+8
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2010-08-041-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into for-nextJiri Kosina2010-08-046-18/+44
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | synclink: use ARRAY_SIZEKulikov Vasiliy2010-07-201-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2010-08-042-2/+2
|\ \ \ \ \ \ \
| * | | | | | | random: Reorder struct entropy_store to remove padding on 64bits Richard Kennedy2010-07-311-1/+1
| * | | | | | | hwrng: n2-drv - remove casts from void*Kulikov Vasiliy2010-07-051-1/+1
* | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2010-08-041-1/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Merge branch 'next' into for-linusDmitry Torokhov2010-08-021-1/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Input: keyboard - also match braille-only keyboardsSamuel Thibault2010-07-311-1/+5
| | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anh...Linus Torvalds2010-07-261-5/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | agp/intel: Use the correct mask to detect i830 aperture size.Tim Gardner2010-07-261-5/+8
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | tpm_tis: fix subsequent suspend failuresRajiv Andrade2010-07-261-1/+8
| |_|_|_|/ / / |/| | | | | |
* | | | | | | sysrq,kdb: Use __handle_sysrq() for kdb's sysrq functionJason Wessel2010-07-211-1/+1
|/ / / / / /
* | | | | | Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/air...Linus Torvalds2010-07-011-4/+2
|\ \ \ \ \ \
| * | | | | | agp: add no warn since we have a fallback to vmalloc pathsDave Airlie2010-06-151-1/+1
| * | | | | | agp: drop vmalloc flag.Dave Airlie2010-06-151-3/+1
| | |/ / / / | |/| | | |
* | | | | | ipmi: set schedule_timeout_wait() value back to oneMartin Wilck2010-06-291-1/+1
* | | | | | ipmi: make sure drivers were registered before unregistering themMatthew Garrett2010-06-291-4/+17