黄涛 ee25a425b9 Merge tag 'lsk-android-14.05' into develop-3.10 ...

lsk 14.05 android release

Conflicts:
	arch/arm/common/Kconfig
	arch/arm64/include/asm/arch_timer.h
	drivers/staging/android/fiq_debugger/fiq_debugger.c
	drivers/usb/Kconfig

2014-06-12 21:04:26 +08:00

..

adf_client.h

video: adf: support "simple" buffers

2013-10-11 16:45:07 -07:00

adf_fbdev.h

video: adf: fbdev: add stubs for kernels without ADF_FBDEV

2014-05-02 16:07:00 -07:00

adf_format.h

video: add atomic display framework

2013-10-11 16:40:50 -07:00

adf_memblock.h

video: adf: add memblock helper

2013-10-11 16:40:59 -07:00

adf.h

video: adf: add buffer padding quirk

2014-04-08 23:41:17 +00:00

atmel_lcdc.h

ARM: at91/avr32/atmel_lcdfb: add platform device-id table

2013-03-13 11:05:12 +01:00

aty128.h

…

auo_k190xfb.h

AUO-K190x: Add resolutions for portrait displays

2013-04-04 13:08:07 +03:00

broadsheetfb.h

broadsheetfb: support storing waveform

2010-03-12 15:52:34 -08:00

cirrus.h

…

cvisionppc.h

…

da8xx-fb.h

da8xx-fb: cleanup LCDC configurations

2012-11-27 11:47:53 +02:00

display_timing.h

rk3288 chromium: update drm fb

2014-03-31 17:58:19 +08:00

edid.h

UAPI: (Scripted) Disintegrate include/video

2012-12-20 17:14:26 +00:00

exynos_dp.h

video: exynos_dp: fix max loop count in EQ sequence of link training

2012-05-08 17:00:53 +00:00

exynos_mipi_dsim.h

drivers/video/exynos/exynos_mipi_dsi.c: use devm_* APIs

2013-02-21 17:22:18 -08:00

gbe.h

…

hecubafb.h

…

iga.h

…

ili9320.h

…

Kbuild

UAPI: (Scripted) Disintegrate include/video

2012-12-20 17:14:26 +00:00

kyro.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

mach64.h

…

maxinefb.h

…

mbxfb.h

…

metronomefb.h

…

mipi_display.h

fbdev: add a MIPI DSI header

2010-05-24 08:47:38 +09:00

mmp_disp.h

video: mmp display subsystem

2013-02-21 17:22:17 -08:00

neomagic.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

newport.h

Merge branch 'master' into for-next

2011-04-26 10:22:59 +02:00

of_display_timing.h

video: add of helper for display timings/videomode

2013-01-24 09:03:48 +01:00

of_videomode.h

video: add of helper for display timings/videomode

2013-01-24 09:03:48 +01:00

omap-panel-data.h

OMAPDSS: n8x0: remove platform backlight calls

2013-04-03 15:19:45 +03:00

omapdss.h

Merge branch 'fbdev-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux into linux-fbdev/for-3.10-fixes

2013-05-29 17:00:34 +08:00

omapvrfb.h

OMAPDSS: VRFB: add omap_vrfb_supported()

2012-10-17 12:17:18 +03:00

permedia2.h

…

platform_lcd.h

drivers/video/backlight/platform_lcd.c: introduce probe callback

2013-04-29 18:28:18 -07:00

pm3fb.h

…

pmag-ba-fb.h

…

pmagb-b-fb.h

…

pxa168fb.h

pxa168fb: remove useless vsync/hsync invert flag

2009-12-01 09:02:32 +08:00

radeon.h

…

s1d13xxxfb.h

s1d13xxxfb: drop unused code

2010-12-21 01:05:43 +09:00

sa1100fb.h

FB: sa1100: remove global sa1100fb_.*_power function pointers

2012-02-21 11:56:19 +00:00

samsung_fimd.h

video: s3c-fb: fix typo in definition of VIDCON1_VSTATUS_FRONTPORCH value

2013-02-21 17:22:18 -08:00

sgivw.h

sgivwfb: Make use of ARRAY_SIZE.

2009-12-04 15:39:52 +01:00

sh_mipi_dsi.h

fbdev: sh_mipi_dsi: Remove the unused sh_mipi_dsi_info lcd_chan field

2012-11-21 15:50:01 +01:00

sh_mobile_hdmi.h

fbdev: sh_mobile_hdmi: add HDMI Control Register support

2012-05-13 13:07:59 +00:00

sh_mobile_lcdc.h

fbdev: sh_mobile_lcdc: Remove unused get_brightness pdata callback

2012-11-21 15:50:02 +01:00

sh_mobile_meram.h

sh_mobile_meram: Add direct MERAM allocation API

2012-07-19 02:05:22 +02:00

sisfb.h

UAPI: (Scripted) Disintegrate include/video

2012-12-20 17:14:26 +00:00

sstfb.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

tdfx.h

…

tgafb.h

…

trident.h

…

udlfb.h

udlfb: fix hcd_buffer_free panic on unplug/replug

2012-03-01 17:46:27 -08:00

uvesafb.h

UAPI: (Scripted) Disintegrate include/video

2012-12-20 17:14:26 +00:00

vga.h

m68k/video: Create <asm/vga.h>

2012-04-22 20:16:50 +02:00

videomode.h

videomode: videomode_from_timing work

2013-03-21 14:34:33 +02:00

w100fb.h

…