summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-26 10:02:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-26 10:02:39 -0700
commit2c518959f082c549d6c6dd9b5380aec40c3eb07f (patch)
tree163deeedb0532e2c7df805cc052f117b32d33fe3 /fs
parent4f6876031ee105466f400661a0dd3fa66c4f0c09 (diff)
parent18016e35d448d35739f8640b51476709c07e95db (diff)
downloadlinux-stable-2c518959f082c549d6c6dd9b5380aec40c3eb07f.tar.gz
linux-stable-2c518959f082c549d6c6dd9b5380aec40c3eb07f.tar.bz2
linux-stable-2c518959f082c549d6c6dd9b5380aec40c3eb07f.zip
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux: OMAP: DSS2: don't power off a panel twice OMAP: DSS2: OMAPFB: Allow usage of def_vrfb only for omap2,3 OMAP: DSS2: OMAPFB: make VRFB depends on OMAP2,3 OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build without VRFB arm/omap: simplify conditional OMAP: DSS2: DSI: Remove extra iounmap in error path OMAP: DSS2: Use dss_features framework on DSS2 code OMAP: DSS2: Introduce dss_features files video/omap: remove mux.h include ARM: omap/fb: move get_fbmem_region() to .init.text ARM: omap/fb: move omapfb_reserve_sram to .init.text ARM: omap/fb: move omap_init_fb to .init.text OMAP: DSS2: OMAPFB: swap front and back porches for both hsync and vsync OMAP: DSS2: make filter coefficient tables human readable OMAP: DSS2: Add SPI dependency to Kconfig of ACX565AKM panel
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions