linux_old1/drivers/staging
Linus Torvalds 2b8318881d fbdev changes for 3.8:
OMAPDSS changes, including:
 - use dynanic debug prints
 - OMAP platform dependency removals
 - Creation of compat-layer, helping us to improve omapdrm
 - Misc cleanups, aiming to make omadss more in line with the upcoming common
   display framework
 
 Exynos DP changes for the 3.8 merge window:
 - Device Tree support for Samsung Exynos DP
 - SW Link training is cleaned up.
 - HPD interrupt is supported.
 
 Samsung Framebuffer changes for the 3.8 merge window:
 - The bit definitions of header file are updated.
 - Some minor typos are fixed.
 - Some minor bugs of s3c_fb_check_var() are fixed.
 
 FB related changes for SH Mobile, Freescale DIU
 
 Add support for the Solomon SSD1307 OLED Controller
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJQyvniAAoJEPo9qoy8lh71IqkQAK9LkVjVk6UQRT2/b39hPF6i
 PKPRNYxpLxX5u98hiqQfweukGkuC/cmsAJOh5UwX1lFg0TNua8CEYg0iuHgUtLWE
 gi+HNUhHfGx1+a9yQpTKsiheq7r88IjpghFGahnFhpE4kDzhIROom7B39x8bx9gs
 1vnCptmcIq0IlMlmjIktTHw8R36Fd/8xDVEhEtDccxT9AJSePnKBY8SBuRjiyJfP
 QvXnd131kmHdshQbSVetsEwI1a9NJ9Z6MMRiQK3vtDiBJ7QHUw8wD/+kdR68gQxZ
 NqTC/s478dvx/bR5CIXHrXxQZGfOCJ0GFzT1rlcRMxECcF0dQYNr3Hid3Zas+mPZ
 hABpEJE7nV7LoDGhW3oIWPt6MZVFED/HE0F5QrG3/PWYs5UpTwkI9UTkB8Bx6LcA
 H9ypHzFaOT1SK2/jln9pAfYgo/ITCRf08gcxBvGZUPcybrQy+kbVPdYgDn09cDhR
 u6ax3k/PMF/6JRdpVRNxLaoEHw/G6vtNjoeRJivZzuIOmGDfGwADGcEnrcZEM3NM
 muOjk8TfTJgK+gzWleOfr9CQGiWWp1Tht9vF6TSApq4SEqmOK81EZpucrMXY0t6r
 9+JmFzS1/+75NeY2YjgHCuqRaqVSMiyyOp1eYV9JIY14rKINbj77OHX8xaMm+Leg
 ZU4tirie/oEALaIJUann
 =KVPX
 -----END PGP SIGNATURE-----

Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux

Pull fbdev changes from Tomi Valkeinen:
 "OMAPDSS changes, including:
   - use dynanic debug prints
   - OMAP platform dependency removals
   - Creation of compat-layer, helping us to improve omapdrm
   - Misc cleanups, aiming to make omadss more in line with the upcoming
     common display framework

  Exynos DP changes for the 3.8 merge window:
   - Device Tree support for Samsung Exynos DP
   - SW Link training is cleaned up.
   - HPD interrupt is supported.

  Samsung Framebuffer changes for the 3.8 merge window:
   - The bit definitions of header file are updated.
   - Some minor typos are fixed.
   - Some minor bugs of s3c_fb_check_var() are fixed.

  FB related changes for SH Mobile, Freescale DIU

  Add support for the Solomon SSD1307 OLED Controller"

* tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux: (191 commits)
  OMAPDSS: fix TV-out issue with DSI PLL
  Revert "OMAPFB: simplify locking"
  OMAPFB: remove silly loop in fb2display()
  OMAPFB: fix error handling in omapfb_find_best_mode()
  OMAPFB: use devm_kzalloc to allocate omapfb2_device
  OMAPDSS: DISPC: remove dispc fck uses
  OMAPDSS: DISPC: get dss clock rate from dss driver
  drivers/video/console/softcursor.c: remove redundant NULL check before kfree()
  drivers/video: add support for the Solomon SSD1307 OLED Controller
  OMAPDSS: use omapdss_compat_init() in other drivers
  OMAPDSS: export dispc functions
  OMAPDSS: export dss_feat functions
  OMAPDSS: export dss_mgr_ops functions
  OMAPDSS: separate compat files in the Makefile
  OMAPDSS: move display sysfs init to compat layer
  OMAPDSS: DPI: use dispc's check_timings
  OMAPDSS: DISPC: add dispc_ovl_check()
  OMAPDSS: move irq handling to dispc-compat
  OMAPDSS: move omap_dispc_wait_for_irq_interruptible_timeout to dispc-compat.c
  OMAPDSS: move blocking mgr enable/disable to compat layer
  ...

Conflicts:
	arch/arm/mach-davinci/devices-da8xx.c
	arch/arm/plat-omap/common.c
	drivers/media/platform/omap/omap_vout.c
2012-12-15 13:03:48 -08:00
..
android Merge branch 'akpm' (Andrew's patchbomb) 2012-12-11 18:05:37 -08:00
asus_oled
bcm Staging: bcm: Remove typedef for _U_MIBS_IP_ADDRESS and call directly. 2012-11-26 16:07:58 -08:00
ccg TTY/Serial merge for 3.8-rc1 2012-12-11 14:08:47 -08:00
ced1401 staging: ced1401: Fix typo in staging/ced1401 2012-11-26 16:21:58 -08:00
comedi Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-12-13 12:00:02 -08:00
cptm1217
crystalhd staging: crystalhd: remove use of __devexit 2012-11-21 15:05:12 -08:00
csr staging: csr: remove CONFIG_HOTPLUG ifdefs 2012-11-21 15:04:58 -08:00
cxt1e1 staging: cxt1e1: sbecrc.c: fixes coding style issue 2012-11-21 14:21:48 -08:00
dgrp TTY/Serial merge for 3.8-rc1 2012-12-11 14:08:47 -08:00
echo
et131x staging: et131x: Removing final checkpatch errors, all line >80 chars 2012-11-21 13:57:28 -08:00
frontier
ft1000 staging: ft1000: remove assigments of ret and initialise it in beginning 2012-11-26 16:21:18 -08:00
fwserial staging/fwserial: Remove superfluous free 2012-11-28 08:46:52 -08:00
gdm72xx Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal 2012-12-12 12:22:13 -08:00
iio staging:iio: Move ad7793 driver out of staging 2012-11-30 12:57:08 +00:00
imx-drm staging: imx-drm: remove use of __devexit 2012-11-21 15:05:02 -08:00
keucr
line6 staging: line6: drop unused dumprequest code 2012-11-26 16:13:51 -08:00
media Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-12-13 19:22:22 -08:00
net staging: net: remove use of __devexit 2012-11-21 15:05:02 -08:00
nvec ARM: arm-soc: Cleanups on various subarchitectures 2012-12-12 11:51:39 -08:00
octeon staging: octeon: remove use of __devexit 2012-11-21 15:05:02 -08:00
olpc_dcon staging: olpc_dcon: remove use of __devexit_p 2012-11-21 15:05:00 -08:00
omap-thermal Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux 2012-12-12 07:57:13 -08:00
omapdrm fbdev changes for 3.8: 2012-12-15 13:03:48 -08:00
ozwpan staging: ozwpan: Remove redundant null check before kfree in ozhcd.c 2012-11-21 13:50:12 -08:00
panel staging: panel: pass correct lengths to keypad_send_key() 2012-11-29 18:16:15 -08:00
phison
quickstart
ramster staging: ramster: depends on NET 2012-10-22 15:42:38 -07:00
rtl8187se staging/rtl8187se: Fix spacing coding style in ieee80211/ieee80211_rx.c 2012-11-28 08:31:46 -08:00
rtl8192e staging: rtl8192e: remove use of __devexit 2012-11-21 14:07:42 -08:00
rtl8192u staging: rtl8192u: remove use of __devexit 2012-11-21 14:07:43 -08:00
rtl8712 staging: r8712u: Fix possible buffer overrun 2012-11-28 08:49:21 -08:00
rts5139 staging: rts5139: fixed issues when config to built-in object 2012-10-22 15:58:22 -07:00
sb105x staging: sb105x: fix potential NULL pointer dereference in mp_chars_in_buffer() 2012-11-29 18:15:27 -08:00
sbe-2t3e3 staging: sbe-2t3e3: remove use of __devexit 2012-11-21 15:05:10 -08:00
sep staging: sep: remove use of __devinit 2012-11-21 15:05:01 -08:00
serqt_usb2 staging/serqt_usb2: Refactor qt_status_change_check() in serqt_usb2.c 2012-11-16 15:03:10 -08:00
silicom Staging: silicom: bypasslib: remove unused including <linux/version.h> 2012-11-01 08:44:42 -07:00
slicoss staging: slicoss: remove use of __devexit 2012-11-21 15:05:11 -08:00
sm7xxfb staging: sm7xxfb: remove use of __devexit 2012-11-21 15:05:12 -08:00
speakup
ste_rmi4 staging: ste_rmi4: remove use of __devexit 2012-11-21 15:05:12 -08:00
tidspbridge Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-12-13 12:00:02 -08:00
usbip staging: usbip: remove use of __devexit_p 2012-11-21 15:04:59 -08:00
vme staging: vme: remove use of __devexit 2012-11-21 15:05:12 -08:00
vt6655 staging: vt6655: remove use of __devexit 2012-11-21 15:05:12 -08:00
vt6656 staging: vt6656: wpa_set_keys remove fcpfkernel 2012-11-26 16:24:16 -08:00
winbond Staging: winbond: wb35rx_s: Fixed coding style issue 2012-11-13 13:11:57 -08:00
wlags49_h2 staging: wlags49_h2: remove use of __devexit 2012-11-21 13:54:04 -08:00
wlags49_h25
wlan-ng staging: wlan-ng: hfa384x_usb.c: fixed a coding style issue 2012-11-02 11:30:19 -07:00
xgifb staging: xgifb: remove use of __devexit 2012-11-21 15:05:12 -08:00
zcache
zram staging: zram: handle mem suffixes in disk size zram_sysfs parameter 2012-10-31 14:49:09 -07:00
zsmalloc
Kconfig TTY/Serial merge for 3.8-rc1 2012-12-11 14:08:47 -08:00
Makefile TTY/Serial merge for 3.8-rc1 2012-12-11 14:08:47 -08:00
staging.c