summaryrefslogtreecommitdiffstats
path: root/drivers/video
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'origin/master'Benjamin Herrenschmidt2008-07-163-10/+23
|\
| * Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6Linus Torvalds2008-07-153-10/+23
| |\
| | * i2c: Let framebuffer drivers set their I2C bus class to DDCJean Delvare2008-07-143-10/+23
* | | Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-buildBenjamin Herrenschmidt2008-07-158-36/+432
|\ \ \ | |/ /
| * | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-07-144-0/+237
| |\ \
| | * \ [ARM] Merge most of the PXA work for initial mergeRussell King2008-07-144-0/+237
| | |\ \
| | | | \
| | | | \
| | | *-. \ Merge branches 'pxa-misc', 'pxa-pwm' and 'pxa-multi' into pxaRussell King2008-07-093-0/+193
| | | |\ \ \
| | | | * | | [ARM] 5141/1: PWM: pwm_request() should return an PTR_ERR() instead of NULL.Ben Dooks2008-07-031-2/+2
| | | | * | | [ARM] 5044/1: pwm_bl: add init/notify/exit callbacksPhilipp Zabel2008-07-031-7/+32
| | | | * | | [ARM] pxa: add generic PWM backlight drivereric miao2008-07-033-0/+168
| | | | |/ /
| | | * | | [ARM] 5118/1: pxafb: add exit and remove handlersJaya Kumar2008-07-071-0/+44
| | | |/ /
| * | | | Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6Linus Torvalds2008-07-141-4/+11
| |\ \ \ \
| | * \ \ \ Merge commit 'v2.6.26' into bkl-removalJonathan Corbet2008-07-1418-203/+183
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | fbmem: cdev lock_kernel() pushdownJonathan Corbet2008-06-201-4/+11
| | | |_|/ | | |/| |
| * | | | Merge branch 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2008-07-142-31/+183
| |\ \ \ \
| | * \ \ \ Merge commit 'v2.6.26' into x86/coreIngo Molnar2008-07-141-1/+19
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Merge branch 'linus' into x86/coreIngo Molnar2008-07-121-2/+2
| | |\ \ \ \
| | * | | | | x86, VisWS: turn into generic arch, move definitionsIngo Molnar2008-07-101-2/+1
| | | | | | |
| | | \ \ \ \
| | | \ \ \ \
| | | \ \ \ \
| | | \ \ \ \
| | | \ \ \ \
| | | \ \ \ \
| | | \ \ \ \
| | *-------. \ \ \ \ Merge branches 'x86/numa-fixes', 'x86/apic', 'x86/apm', 'x86/bitops', 'x86/bu...Ingo Molnar2008-07-0818-233/+348
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | | | | | | * | | | Merge branch 'linus' into x86/xenIngo Molnar2008-06-1614-167/+108
| | | | | | | |\ \ \ \ | | | | | | | |/ / / / | | | | | | |/| | | |
| | | | | | | * | | | xen pvfb: Dynamic mode support (screen resizing)Markus Armbruster2008-05-271-29/+154
| | | | | | | * | | | xen pvfb: Zero unused bytes in events sent to backendMarkus Armbruster2008-05-271-0/+1
| | | | | | | * | | | xen pvfb: Module aliases to support module autoloadingMarkus Armbruster2008-05-271-0/+2
| | | | | | | * | | | xen: Enable console tty by default in domU if it's not a dummyMarkus Armbruster2008-05-271-0/+25
| | | | | |_|/ / / / | | | | |/| | | | |
| * | | | | | | | | drm: reorganise drm tree to be more future proof.Dave Airlie2008-07-141-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge commit 'origin/HEAD' into test-mergeBenjamin Herrenschmidt2008-07-145-33/+68
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | fbdev: bugfix for multiprocess defioJaya Kumar2008-07-121-1/+19
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Fix broken fix for fsl-diu-dbTakashi Iwai2008-07-081-2/+2
| | |/ / / / / | |/| | | | |
| * | | | | | w100fb: add 80 MHz modelinePhilipp Zabel2008-07-041-0/+1
| * | | | | | w100fb: do not depend on SHARPSLPhilipp Zabel2008-07-041-1/+2
| * | | | | | fsl_diu_fb: fix build with CONFIG_PM=y, plus fix some warningsAnton Vorontsov2008-07-041-14/+15
| | |_|_|_|/ | |/| | | |
| * | | | | [ARM] 5117/1: pxafb: fix __devinit/exit annotationsJaya Kumar2008-06-251-8/+8
| * | | | | [ARM] 5116/1: pxafb: cleanup and fix order of failure handlingJaya Kumar2008-06-221-10/+24
| * | | | | [ARM] 5115/1: pxafb: fix ifdef for command line option handlingJaya Kumar2008-06-221-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'linux-2.6'Paul Mackerras2008-06-305-50/+50
|\ \ \ \ \ | |/ / / /
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2008-06-131-32/+26
| |\ \ \ \
| | * | | | sparc: get leo framebuffer workingRobert Reif2008-06-101-32/+26
| | |/ / /
| * | | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-06-121-2/+4
| |\ \ \ \
| | * | | | [ARM] 5090/1: Correct pxafb palette typo errorJürgen Schindele2008-06-111-2/+4
| * | | | | drivers/video/cirrusfb: fix RAM address printkPhilippe De Muyter2008-06-121-3/+3
| * | | | | hgafb: resource management fixKrzysztof Helt2008-06-121-11/+15
| * | | | | fsl-diu-db: compile fixJeff Mahoney2008-06-121-2/+2
| |/ / / /
* | | | | platinumfb: Use linux/of_{device,platform}.h instead of asmStephen Rothwell2008-06-091-2/+2
|/ / / /
* | | | fbdev: export symbol fb_mode_optionGeoff Levand2008-06-061-0/+1
* | | | fbcon: fix wrong vmode bits copied on console switchKrzysztof Helt2008-06-061-3/+1
* | | | modedb: fix incorrect sync and vmode flags for CVT modesKrzysztof Helt2008-06-061-0/+1
* | | | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-05-241-1/+0
|\ \ \ \
| * | | | [ARM] 5043/1: pxafb: remove unused mode variable in pxafb_init_fbinfoPhilipp Zabel2008-05-221-1/+0
| | |/ / | |/| |
* | | | S3C2410: fix driver MODULE_ALIAS()Ben Dooks2008-05-241-0/+2
* | | | S3C2410: clean out changelog header and tidyBen Dooks2008-05-242-83/+11
OpenPOWER on IntegriCloud