openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/video/omap2/dss
History
Linus Torvalds 06991c28f3 Driver core patches for 3.9-rc1 
Here is the big driver core merge for 3.9-rc1
 
 There are two major series here, both of which touch lots of drivers all
 over the kernel, and will cause you some merge conflicts:
   - add a new function called devm_ioremap_resource() to properly be
     able to check return values.
   - remove CONFIG_EXPERIMENTAL
 
 If you need me to provide a merged tree to handle these resolutions,
 please let me know.
 
 Other than those patches, there's not much here, some minor fixes and
 updates.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iEYEABECAAYFAlEmV0cACgkQMUfUDdst+yncCQCfbmnQZju7kzWXk6PjdFuKspT9
 weAAoMCzcAtEzzc4LXuUxxG/sXBVBCjW
 =yWAQ
 -----END PGP SIGNATURE-----

Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core patches from Greg Kroah-Hartman:
 "Here is the big driver core merge for 3.9-rc1

  There are two major series here, both of which touch lots of drivers
  all over the kernel, and will cause you some merge conflicts:

   - add a new function called devm_ioremap_resource() to properly be
     able to check return values.

   - remove CONFIG_EXPERIMENTAL

  Other than those patches, there's not much here, some minor fixes and
  updates"

Fix up trivial conflicts

* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
  base: memory: fix soft/hard_offline_page permissions
  drivercore: Fix ordering between deferred_probe and exiting initcalls
  backlight: fix class_find_device() arguments
  TTY: mark tty_get_device call with the proper const values
  driver-core: constify data for class_find_device()
  firmware: Ignore abort check when no user-helper is used
  firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
  firmware: Make user-mode helper optional
  firmware: Refactoring for splitting user-mode helper code
  Driver core: treat unregistered bus_types as having no devices
  watchdog: Convert to devm_ioremap_resource()
  thermal: Convert to devm_ioremap_resource()
  spi: Convert to devm_ioremap_resource()
  power: Convert to devm_ioremap_resource()
  mtd: Convert to devm_ioremap_resource()
  mmc: Convert to devm_ioremap_resource()
  mfd: Convert to devm_ioremap_resource()
  media: Convert to devm_ioremap_resource()
  iommu: Convert to devm_ioremap_resource()
  drm: Convert to devm_ioremap_resource()
  ...
 		2013-02-21 12:05:51 -08:00
..
Kconfig Merge branch '3.8/vram-conversion' of git://gitorious.org/linux-omap-dss2/linux 2012-11-16 11:42:46 +02:00
Makefile OMAPDSS: separate compat files in the Makefile 2012-12-07 17:05:58 +02:00
apply.c OMAPDSS: move display sysfs init to compat layer 2012-12-07 17:05:58 +02:00
core.c OMAPDSS: use omapdss_compat_init() in other drivers 2012-12-07 17:06:00 +02:00
dispc-compat.c OMAPDSS: move irq handling to dispc-compat 2012-12-07 17:05:57 +02:00
dispc-compat.h OMAPDSS: move irq handling to dispc-compat 2012-12-07 17:05:57 +02:00
dispc.c OMAPDSS: DISPC: remove dispc fck uses 2012-12-12 13:34:14 +02:00
dispc.h OMAPDSS: DISPC: Add writeback register offsets and dss features structs 2012-09-26 14:58:50 +03:00
dispc_coefs.c OMAPDSS: DISPC: Fix FIR coefficients 2012-03-06 14:08:23 +02:00
display-sysfs.c OMAPDSS: create display-sysfs.c 2012-11-27 12:47:25 +02:00
display.c OMAPDSS: move display sysfs init to compat layer 2012-12-07 17:05:58 +02:00
dpi.c OMAPDSS: fix TV-out issue with DSI PLL 2012-12-13 14:24:43 +02:00
dsi.c OMAPDSS: manage framedone irq with mgr ops 2012-12-07 17:05:55 +02:00
dss.c OMAPDSS: DISPC: get dss clock rate from dss driver 2012-12-12 13:34:13 +02:00
dss.h OMAPDSS: DISPC: get dss clock rate from dss driver 2012-12-12 13:34:13 +02:00
dss_features.c OMAPDSS: add FEAT_DPI_USES_VDDS_DSI to omap3630_dss_feat_list 2013-02-14 13:06:46 +02:00
dss_features.h OMAPDSS: export dss_feat functions 2012-12-07 17:05:59 +02:00
hdmi.c video: Convert to devm_ioremap_resource() 2013-01-22 11:41:58 -08:00
hdmi_panel.c OMAPDSS: HDMI: Make panel return dssdev register errors 2012-11-06 13:33:35 +02:00
manager-sysfs.c OMAPDSS: MANAGER: Update display sysfs store 2012-09-26 14:58:37 +03:00
manager.c OMAPDSS: move ovl-mgr function setup to apply.c 2012-12-07 17:05:54 +02:00
output.c OMAPDSS: export dss_mgr_ops functions 2012-12-07 17:05:59 +02:00
overlay-sysfs.c OMAPDSS: split overlay sysfs code 2012-09-07 20:02:10 +03:00
overlay.c OMAPDSS: move ovl function setup to apply.c 2012-12-07 17:05:54 +02:00
rfbi.c OMAPDSS: manage framedone irq with mgr ops 2012-12-07 17:05:55 +02:00
sdi.c OMAPDSS: manage output-dssdev connection in output drivers 2012-12-07 16:55:04 +02:00
ti_hdmi.h OMAPDSS: HDMI: Add op to get audio DMA port address offset 2012-11-06 13:33:36 +02:00
ti_hdmi_4xxx_ip.c OMAPDSS: HDMI: Add op to get audio DMA port address offset 2012-11-06 13:33:36 +02:00
ti_hdmi_4xxx_ip.h OMAPDSS: HDMI: Add an audio configuration function 2012-05-11 15:17:08 +03:00
venc.c OMAPDSS: manage output-dssdev connection in output drivers 2012-12-07 16:55:04 +02:00
venc_panel.c OMAPDSS: remove omap_dss_device's suspend/resume 2012-10-24 08:46:23 +03:00