summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/k...Linus Torvalds2012-10-126-17/+369
|\
| * Update SmPL/Coccinelle section of MAINTAINERSNicolas Palix2012-10-111-3/+3
| * coccicheck: Add the rep+ctxt modeNicolas Palix2012-10-111-0/+3
| * scripts/coccinelle/tests/odd_ptr_err.cocci: semantic patch for IS_ERR/PTR_ERR...Julia Lawall2012-10-111-0/+65
| * scripts/tags.sh: Add magic for pci access functionsKirill Tkhai2012-08-311-2/+6
| * scripts/coccinelle: ptr_ret: Add ternary operator versionLars-Peter Clausen2012-08-311-0/+26
| * scripts/kernel-doc: drop maintainerRandy Dunlap2012-08-311-5/+0
| * scripts/kernel-doc: added support for html5Dan Luedtke2012-08-311-7/+266
* | Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare...Linus Torvalds2012-10-1211-138/+296
|\ \
| * | kconfig: replace 'oldnoconfig' with 'olddefconfig', and keep the old name as ...Adam Lee2012-09-273-20/+32
| * | menuconfig: Assign jump keys per-page instead of globallyBenjamin Poirier2012-09-276-73/+149
| * | menuconfig: Do not open code textbox scroll up/downBenjamin Poirier2012-09-271-44/+11
| * | menuconfig: Add jump keys to search resultsBenjamin Poirier2012-09-275-35/+94
| * | menuconfig: Extend dialog_textbox so that it can return to a scrolled positionBenjamin Poirier2012-09-273-6/+28
| * | menuconfig: Extend dialog_textbox so that it can exit on arbitrary keypressesBenjamin Poirier2012-09-273-13/+33
| * | menuconfig: Remove superfluous conditionnalBenjamin Poirier2012-09-271-5/+3
| * | kconfig: document oldnoconfig to what it really does in conf.cAdam Lee2012-08-311-1/+1
| * | kconfig/mconf.c: revision of curses initialization.Dirk Gouders2012-08-303-4/+8
| |/
* | Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...Linus Torvalds2012-10-126-22/+10
|\ \
| * | compiler-gcc4.h: correct verion check for __compiletime_errorDaniel Santos2012-10-111-1/+1
| * | modpost: Permit .GCC.command.line sectionsJonathan Kliegman2012-10-111-0/+1
| * | Kbuild: use normal compression settings for tar*-pkgAndi Kleen2012-09-271-3/+3
| * | scripts/Makefile.modpost: error in finding modules from .mod files.이건호2012-08-312-2/+2
| * | kbuild: Remove useless warning while appending KCFLAGSOzan Çağlayan2012-08-311-16/+3
| |/
* | Merge tag 'fbdev-updates-for-3.7' of git://github.com/schandinat/linux-2.6Linus Torvalds2012-10-12127-4718/+5347
|\ \
| * | gbefb: fix compile errorFlorian Tobias Schandinat2012-10-111-1/+1
| * | Merge tag 'omapdss-for-3.7' of git://gitorious.org/linux-omap-dss2/linux into...Florian Tobias Schandinat2012-10-10270-3950/+6505
| |\ \
| | * | OMAPDSS: add missing include for string.hTomi Valkeinen2012-09-282-0/+2
| | * | Merge branch 'archit/wb-dispc-for-3.7'Tomi Valkeinen2012-09-267-185/+510
| | |\ \
| | | * | OMAPDSS: DISPC: Configure color conversion coefficients for writebackArchit Taneja2012-09-261-28/+33
| | | * | OMAPDSS: DISPC: Add manager like functions for writebackArchit Taneja2012-09-262-0/+75
| | | * | OMAPDSS: DISPC: Configure writeback FIFOsArchit Taneja2012-09-261-1/+9
| | | * | OMAPDSS: DISPC: Configure writeback specific parameters in dispc_wb_setup()Archit Taneja2012-09-262-3/+27
| | | * | OMAPDSS: DISPC: Configure overlay-like parameters in dispc_wb_setupArchit Taneja2012-09-263-0/+42
| | | * | OMAPDSS: DISPC: Add function to set channel in for writebackArchit Taneja2012-09-262-0/+20
| | | * | OMAPDSS: DISPC: Don't set chroma resampling bit for writebackArchit Taneja2012-09-261-3/+6
| | | * | OMAPDSS: DISPC: Downscale chroma if plane is writebackArchit Taneja2012-09-261-1/+1
| | | * | OMAPDSS: DISPC: Configure input and output sizes for writebackArchit Taneja2012-09-261-2/+5
| | | * | OMAPDSS: DISPC: Add writeback register offsets and dss features structsArchit Taneja2012-09-263-0/+53
| | | * | OMAPDSS: DISPC: Allow both upscaling and downscaling of chromaArchit Taneja2012-09-261-10/+22
| | | * | OMAPDSS: DIPSC: Relax scaling limitations when in memory to memory modeArchit Taneja2012-09-263-21/+43
| | | * | OMAPDSS: DISPC: Don't pass channel out when configuring overlaysArchit Taneja2012-09-261-46/+64
| | | * | OMAPDSS: DISPC: Make dispc_ovl_setup call dispc_ovl_setup_commonArchit Taneja2012-09-261-58/+72
| | | * | OMAPDSS: OVERLAY: Add position and replication as overlay capsArchit Taneja2012-09-263-18/+42
| | | * | OMAPDSS: DISPC: Pass overlay caps as a parameter to dispc plane functionsArchit Taneja2012-09-261-19/+17
| | | * | OMAPDSS: DISPC: Simplify function names for setting pipeline input and output...Archit Taneja2012-09-261-4/+7
| | | * | OMAPDSS: DISPC: Constify omap_overlay_info in dispc_ovl_setup()Archit Taneja2012-09-262-5/+6
| | * | | Merge branch 'archit/outputs-for-3.7'Tomi Valkeinen2012-09-2623-198/+743
| | |\| |
| | | * | OMAPDSS: Remove old way of setting manager and device linksArchit Taneja2012-09-263-71/+0
| | | * | OMAPDSS: APPLY: Remove omap_dss_device references from dss_ovl_enable/disableArchit Taneja2012-09-261-2/+2