github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-05 13:06:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
5f76945a9c
linux/drivers/staging
History
Linus Torvalds 5f76945a9c fbdev updates for 3.7 
It includes:
 - large updates for OMAP
   - basic OMAP5 DSS support for DPI and DSI outputs
   - large cleanups and restructuring
 - some update to Exynos and da8xx-fb
 - removal of the pnx4008 driver (arch removed)
 - various other small patches
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJQdz+EAAoJECSVL5KnPj1PyiMP/R84rSfGUbDIh0Cr6g1Snk76
 h2/1i19TuEgJAWH1q0lnwhqMC3yYmkA1Hz3ulT35KS+/L3IEgUosOESrxZIJhxHI
 f55pk3v8dueN0rx3OhCknLT7hGpVsI4vSN+3yf9LetDp3qt8UVwKLFzVij1VF/MS
 b1wA+RBe1IYMR0bB6pK0AgMZZiBkQMta5rKs5IfDDi8kMgMT4+V8l/iFmt2Ue833
 VxdPw+3reKshBXKTkQt1Usv4JRtG7OgwpRmFhxOo+ag0dxPLeUe/3wZG54qfOywF
 7jK+mnxmW8oZxLkGBvygrmzd40MH6H09N7i/IKVQ0GZoHgAqWWe7VvWahpg8LzwB
 ynktwWZ3Va98p5u/BIafBr0ZOU30mPL8N0aqR3HU7H12Wq21HtwcF+ewiT4vnMc8
 CKzt6VL0qY1tOOdzJzmICzvXGkbBGfj9YOUptJALCIa3bLwZodyQ/bKq8V/bHdTg
 2yyUmVhVf/r5qLermjQN8TjFMpRf2SNwTUUYvhUNwZ4yZMVWZgjjhtAlGGFCA/Bs
 qMRuNpbHMedhzNV4py418Xe3Hwg6TLPuWSWGJ67SG8hxsYy2hq7GebSsXXdC7xG9
 N5DMpA88IQR2nLwkr/pslFqjRsUI6ULvIfxibHEoNjQ0GOY9f+hEWbdHBZPI+0Gv
 Ea9d7nyhmYTZgvRcd9U0
 =EJUS
 -----END PGP SIGNATURE-----

Merge tag 'fbdev-updates-for-3.7' of git://github.com/schandinat/linux-2.6

Pull fbdev updates from Florian Tobias Schandinat:
 "This includes:
   - large updates for OMAP
     - basic OMAP5 DSS support for DPI and DSI outputs
     - large cleanups and restructuring
   - some update to Exynos and da8xx-fb
   - removal of the pnx4008 driver (arch removed)
   - various other small patches"

Fix up some trivial conflicts (mostly just include line changes, but
also some due to the renaming of the deferred work functions by Tejun).

* tag 'fbdev-updates-for-3.7' of git://github.com/schandinat/linux-2.6: (193 commits)
  gbefb: fix compile error
  video: mark nuc900fb_map_video_memory as __devinit
  video/mx3fb: set .owner to prevent module unloading while being used
  video: exynos_dp: use clk_prepare_enable and clk_disable_unprepare
  drivers/video/exynos/exynos_mipi_dsi.c: fix error return code
  drivers/video/savage/savagefb_driver.c: fix error return code
  video: s3c-fb: use clk_prepare_enable and clk_disable_unprepare
  da8xx-fb: save and restore LCDC context across suspend/resume cycle
  da8xx-fb: add pm_runtime support
  video/udlfb: fix line counting in fb_write
  OMAPDSS: add missing include for string.h
  OMAPDSS: DISPC: Configure color conversion coefficients for writeback
  OMAPDSS: DISPC: Add manager like functions for writeback
  OMAPDSS: DISPC: Configure writeback FIFOs
  OMAPDSS: DISPC: Configure writeback specific parameters in dispc_wb_setup()
  OMAPDSS: DISPC: Configure overlay-like parameters in dispc_wb_setup
  OMAPDSS: DISPC: Add function to set channel in for writeback
  OMAPDSS: DISPC: Don't set chroma resampling bit for writeback
  OMAPDSS: DISPC: Downscale chroma if plane is writeback
  OMAPDSS: DISPC: Configure input and output sizes for writeback
  ...
2012-10-12 10:21:02 +09:00
..
android mm: kill vma flag VM_CAN_NONLINEAR 2012-10-09 16:22:17 +09:00
asus_oled Staging: asus_oled: Add suspend/resume callbacks 2012-09-04 13:12:13 -07:00
bcm Staging: bcm: Remove typedef for _stCPacketClassificationRuleSI and call directly. 2012-09-26 09:31:52 -07:00
ccg Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2012-10-02 09:54:49 -07:00
ced1401 staging:ced1401: remove read write callbacks from fops 2012-09-21 08:56:41 -07:00
comedi staging: comedi: jr3_pci: fix iomem dereference 2012-09-27 10:06:36 -07:00
cptm1217 staging: cptm1217: use module_i2c_driver macro 2012-09-04 14:23:33 -07:00
crystalhd drivers/staging/crystalhd/crystalhd_lnx.c: adjust inconsistent IS_ERR and PTR_ERR 2012-09-04 14:22:48 -07:00
csr staging: Fix spelling of "asynchronous" in comments. 2012-09-21 08:56:41 -07:00
cxt1e1 staging: cxt1e1: solve coding style problem 2012-09-04 14:27:42 -07:00
dgrp userns: Fix build of drivers/staging/dgrp 2012-10-03 09:52:08 -07:00
echo Staging: echo: One variable per line 2012-07-06 16:08:57 -07:00
et131x Staging tree update for 3.7-rc1 2012-10-01 12:11:39 -07:00
frontier staging/frontier: fix checkpatch warnings 2012-07-19 16:11:26 -07:00
ft1000 staging: ft1000: replace c99 comments with c88 2012-09-17 05:31:32 -07:00
gdm72xx Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-10-02 13:38:27 -07:00
iio staging:iio:dummy: Fix potential NULL pointer dereference 2012-09-22 10:55:08 +01:00
imx-drm staging: drm/imx: Add TODO 2012-09-21 09:17:07 -07:00
ipack TTY merge for 3.7-rc1 2012-10-01 12:26:52 -07:00
keucr USB merge for 3.7-rc1 2012-10-01 13:23:01 -07:00
line6 staging: line6: variax.c: Eliminated remaining strict_stroul()s 2012-08-14 16:46:34 -07:00
media [media] v4l2: make vidioc_s_crop const 2012-09-26 11:02:25 -03:00
net
nvec Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2012-10-02 09:54:49 -07:00
octeon staging: octeon_ethernet: Convert to use device tree. 2012-07-23 13:54:53 +01:00
olpc_dcon staging/olpc_dcon: fix checkpatch warnings 2012-08-17 09:45:37 -07:00
omap-thermal staging: omap-thermal: bandgap: fix setting of alert thresholds 2012-09-21 08:56:40 -07:00
omapdrm fbdev updates for 3.7 2012-10-12 10:21:02 +09:00
ozwpan staging: ozwpan: compare pointer to NULL rather than 0 2012-09-19 09:28:14 +01:00
panel staging: Fix misspellings of "whether". 2012-09-21 08:56:40 -07:00
phison staging/phison: use module_pci_driver macro 2012-07-11 17:26:02 -07:00
quickstart
ramster staging: ramster: fix build warnings 2012-09-07 22:05:03 -07:00
rtl8187se staging: rtl8187se: using random_ether_addr() to generate random MAC 2012-09-04 14:10:08 -07:00
rtl8192e Staging tree update for 3.7-rc1 2012-10-01 12:11:39 -07:00
rtl8192u staging: Fix misspellings of "whether". 2012-09-21 08:56:40 -07:00
rtl8712 staging: r8712u: Do not queue cloned skb 2012-09-26 13:05:50 -07:00
rts_pstor staging/rts_pstor: Delete some lines (dev_info() and dev_err()) in rtsx.c 2012-09-21 08:56:41 -07:00
rts5139 staging: rts5139: use kzalloc() to close an info leak 2012-09-26 09:19:50 -07:00
sbe-2t3e3 staging: sbe-2t3e3: fix error handling in t3e3_init_channel() 2012-09-25 15:48:25 -07:00
sep Staging: sep: Correct misspelled "remap_page_range" -> "remap_pfn_range" 2012-09-04 14:27:41 -07:00
serqt_usb2 USB merge for 3.7-rc1 2012-10-01 13:23:01 -07:00
silicom staging: fix silicom dependencies and build errors 2012-09-21 08:56:40 -07:00
slicoss staging: slicoss: fix a null deref when pci_alloc_consistent fail 2012-09-05 11:59:51 -07:00
sm7xxfb staging: sm7xxfb: remove smtc_VRAMBaseAddress 2012-09-17 14:57:53 -07:00
speakup TTY merge for 3.7-rc1 2012-10-01 12:26:52 -07:00
ste_rmi4 staging: ste_rmi4: remove gpio.h include 2012-09-14 09:21:56 -05:00
telephony staging: Fix spelling of "asynchronous" in comments. 2012-09-21 08:56:41 -07:00
tidspbridge mm: kill vma flag VM_RESERVED and mm->reserved_vm counter 2012-10-09 16:22:19 +09:00
usbip USB merge for 3.7-rc1 2012-10-01 13:23:01 -07:00
vme staging/vme: Use pr_ printks in vme_pio2_core.c 2012-09-04 13:22:48 -07:00
vt6655 staging: vt6655: vt6655_init_info function must be void type 2012-09-07 22:07:37 -07:00
vt6656 Merge 3.6-rc6 into staging-next 2012-09-16 17:17:25 -07:00
winbond Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-10-02 13:38:27 -07:00
wlags49_h2 staging: "wlags49_h2" Fix typos. 2012-09-10 20:24:01 -07:00
wlags49_h25 staging: "wlags49_h25" Fix typos. 2012-09-17 14:50:33 -07:00
wlan-ng staging "wlan-ng" Fix typos. 2012-09-26 09:19:50 -07:00
xgifb staging: xgifb: delete bogus video RAM configuration 2012-09-13 20:41:57 -07:00
zcache Merge 3.6-rc6 into staging-next 2012-09-16 17:17:25 -07:00
zram staging: zsmalloc: add mapping modes 2012-07-09 11:35:00 -07:00
zsmalloc zsmalloc: collapse internal .h into .c 2012-08-13 19:34:24 -07:00
Kconfig TTY merge for 3.7-rc1 2012-10-01 12:26:52 -07:00
Makefile TTY merge for 3.7-rc1 2012-10-01 12:26:52 -07:00
staging.c