aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | agp: kill agp_rebind_memoryDaniel Vetter2010-11-231-20/+0
| * | | | | | | drm/i915: restore gtt on resume in the drm instead of in intel-gtt.koDaniel Vetter2010-11-231-5/+0
| * | | | | | | agp: kill agp_flush_chipset and corresponding ioctlDaniel Vetter2010-11-236-24/+0
| * | | | | | | drm/i915/gtt: call chipset flush directlyDaniel Vetter2010-11-231-0/+7
| * | | | | | | drm/i915|intel-gtt: consolidate intel-gtt.h headersDaniel Vetter2010-11-231-5/+0
| * | | | | | | intel-gtt: fold i81x-only dcache support into the generic driverDaniel Vetter2010-11-231-89/+61
| * | | | | | | intel-gtt: switch i81x to the common initialization helpersDaniel Vetter2010-11-231-127/+71
| * | | | | | | intel-gtt: switch i81x to the write_entry helpersDaniel Vetter2010-11-231-92/+60
| * | | | | | | intel-gtt: kill unneeded sandybridge memory typesDaniel Vetter2010-11-231-6/+0
| * | | | | | | intel-gtt: drop dcache support for i830 and laterDaniel Vetter2010-11-231-7/+1
| * | | | | | | agp/intel: Remove confusion of stolen entries not stolen memoryChris Wilson2010-11-231-33/+7
| * | | | | | | agp/intel: Remove the artificial cap on stolen sizeChris Wilson2010-11-231-13/+3
| * | | | | | | Merge branch 'drm-intel-fixes' into drm-intel-nextChris Wilson2010-11-2212-15/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'drm-intel-fixes' into drm-intel-nextChris Wilson2010-11-1547-25702/+290
| |\ \ \ \ \ \ \ \
| * | | | | | | | | agp/intel: restore cache behavior on sandybridgeZhenyu Wang2010-11-021-1/+1
| * | | | | | | | | agp/intel: fix cache control for sandybridgeZhenyu Wang2010-11-021-2/+2
| * | | | | | | | | agp/intel: the GMCH is always enabled for integrated processor graphicsChris Wilson2010-10-311-16/+27
| * | | | | | | | | agp/intel: Sandybridge doesn't require GMCH enablingChris Wilson2010-10-291-7/+30
| * | | | | | | | | intel-gtt: maximize ggtt size on platforms that support thisDaniel Vetter2010-10-272-29/+81
| * | | | | | | | | intel-gtt: save PGETBL_CTL later in the setup processDaniel Vetter2010-10-271-7/+7
* | | | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2011-01-102-2/+23
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into nextJames Morris2011-01-1017-38/+216
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | key: add tpm_send commandMimi Zohar2010-11-291-0/+16
| * | | | | | | | | | | tpm: add module_put wrapperMimi Zohar2010-11-292-2/+7
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2011-01-101-4/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ipmi: explicitly include of_address.h and of_irq.hRob Herring2011-01-041-0/+2
| * | | | | | | | | | | of: Fixes for OF probing on little endian systemsRob Herring2011-01-031-4/+4
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | headers: kobject.h reduxAlexey Dobriyan2011-01-101-1/+0
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...Linus Torvalds2011-01-071-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | random: Use this_cpu_inc_returnChristoph Lameter2010-12-171-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wqLinus Torvalds2011-01-076-8/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tpm: don't use flush_scheduled_work()Tejun Heo2010-12-241-2/+2
| * | | | | | | | | | sonypi: don't use flush_scheduled_work()Tejun Heo2010-12-241-1/+1
| * | | | | | | | | | hvsi: don't use flush_scheduled_work()Tejun Heo2010-12-241-2/+2
| * | | | | | | | | | pcmcia/ipwireless: don't use flush_scheduled_work()Tejun Heo2010-12-243-3/+4
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2011-01-076-3/+146
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | ip2: fix compiler warning on ip2main_pci_tblNamhyung Kim2010-12-101-1/+1