aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kms-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwe...Linus Torvalds2010-08-052-0/+27
|\
| * fb: add hooks to handle KDB enter/exitJesse Barnes2010-08-052-0/+27
* | Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2010-08-0511-19/+22
|\ \
| * | of/address: Clean up function declarationsGrant Likely2010-08-012-1/+4
| * | of/platform: remove all of_bus_type and of_platform_bus_type referencesGrant Likely2010-07-249-18/+18
* | | Merge branch 'upstream/xen' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2010-08-051-1/+1
|\ \ \
| * \ \ Merge branch 'upstream/pvhvm' into upstream/xenJeremy Fitzhardinge2010-08-041-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | x86: early PV on HVM features initialization.Sheng Yang2010-07-221-1/+1
* | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2010-08-054-247/+116
|\ \ \ \
| * | | | of/xilinxfb: update tft compatible versionsAdrian Alonso2010-08-011-0/+2
| * | | | powerpc/fsl-diu-fb: Support setting display mode using EDIDAnatolij Gustschin2010-08-012-6/+75
| * | | | powerpc/5121: shared DIU framebuffer supportAnatolij Gustschin2010-08-011-2/+15
| * | | | powerpc/5121: move fsl-diu-fb.h to include/linuxAnatolij Gustschin2010-08-012-224/+1
| * | | | powerpc/5121: fsl-diu-fb: fix issue with re-enabling DIU area descriptorAnatolij Gustschin2010-08-011-15/+23
| | |_|/ | |/| |
* | | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2010-08-054-2/+859
|\ \ \ \
| * | | | FBDEV: JZ4740: Add framebuffer driverLars-Peter Clausen2010-08-053-0/+857
| * | | | VIDEO: Correct use of request_region/request_mem_regionJulia Lawall2010-08-051-2/+2
| | |/ / | |/| |
* | | | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2010-08-043-4/+4
|\ \ \ \
| * \ \ \ Merge branch 'master' into for-nextJiri Kosina2010-08-0413-72/+137
| |\ \ \ \
| * | | | | update email addressPavel Machek2010-07-191-2/+2
| * | | | | Merge branch 'master' into for-nextJiri Kosina2010-06-1666-471/+4345
| |\ \ \ \ \
| * | | | | | fix typos concerning "initiali[zs]e"Uwe Kleine-König2010-06-162-2/+2
* | | | | | | Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2010-08-041-1/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | V4L/DVB: drivers/video/omap2/displays: add missing mutex_unlockJulia Lawall2010-08-021-1/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-08-032-19/+86
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'devel-stable' into develRussell King2010-07-311-1/+71
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev...Russell King2010-07-291-1/+71
| | |\ \ \ \ \
| | | * | | | | imxfb: add pwmr controlled backlight supportEric Bénard2010-07-261-1/+71
| | | | | | | |
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| *-----. \ \ \ \ \ \ Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl...Russell King2010-07-311-18/+15
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | / / / | | | |_|_|_|_|/ / / | | |/| | | | | / / | | | | |_|_|_|/ / | | | |/| | | | / | | | | | | |_|/ | | | | | |/| |
| | | | * | | | ARM: OMAP: Convert OMAPFB and VRAM SDRAM reservation to LMBRussell King2010-07-271-18/+15
| | | | |/ / /
* | | | | | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-07-301-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | cyber2000fb: fix console in truecolor modesOndrej Zary2010-07-301-0/+1
| * | | | | | cyber2000fb: fix machine hang on module loadOndrej Zary2010-07-301-0/+2
| | |_|/ / / | |/| | | |
* | | | | | VIDEO: Au1100fb: Fix section mismatchRalf Baechle2010-07-261-3/+3
* | | | | | VIDEO: PMAGB-B: Fix section mismatchRalf Baechle2010-07-261-6/+6
* | | | | | VIDEO: PMAG-BA: Fix section mismatchRalf Baechle2010-07-261-3/+3
* | | | | | VIDEO. gbefb: Fix section mismatches.Ralf Baechle2010-07-261-8/+8
| |_|/ / / |/| | | |
* | | | | Fix up trivial spelling errors ('taht' -> 'that')Linus Torvalds2010-07-211-1/+1
|/ / / /
* | | | drivers/video/nuc900fb.c: fix lcd build errorWan ZongShun2010-06-291-2/+0
* | | | lxfb: fix incorrect __init annotationAndres Salomon2010-06-291-8/+10
* | | | gxfb: fix incorrect __init annotationAndres Salomon2010-06-291-8/+12
* | | | Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linuxLinus Torvalds2010-06-272-14/+5
|\ \ \ \ | |/ / / |/| | |
| * | | OMAP: OMAPFB: fix rfbi.c compile errorTomi Valkeinen2010-06-151-2/+3
| * | | OMAPFB: LCDC: change update_mode to DISABLED when going suspendJanusz Krzysztofik2010-06-151-12/+2
| |/ /
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2010-06-041-3/+3
|\ \ \
| * \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Paul Mundt2010-05-3131-314/+3048
| |\ \ \ | | |/ /
| * | | fbdev: fix erroneous index in drivers/video/sh_mobile_lcdcfb.cGuennadi Liakhovetski2010-05-251-3/+3
* | | | fbdev: fix frame buffer devices menuThadeu Lima de Souza Cascardo2010-06-041-3/+3
* | | | fb_defio: redo fix for non-dirty ptesAlbert Herranz2010-06-041-1/+11
* | | | Revert "fb_defio: fix for non-dirty ptes"Albert Herranz2010-06-041-32/+8