redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity
remarkable-linux/drivers/staging/gma500
History
Linus Torvalds 1380516599 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits)
  staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register.
  staging:iio:kfifo_buf fix double initialization of the ring device structure.
  staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata.
  staging:iio:imu fix missing register table index for some channels
  spectra: enable device before poking it
  staging: rts_pstor: Fix a miswriting
  staging/lirc_bt829: Return -ENODEV when no hardware is found.
  staging/lirc_parallel: remove pointless prototypes.
  staging/lirc_parallel: fix panic on rmmod
  staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata.
  Staging: zram: Fix kunmapping order
  Revert "gma500: Fix dependencies"
  gma500: Add medfield header
  gma500: wire up the mrst i2c bus from chip_info
  gma500: Fix DPU build
  gma500: Clean up the DPU config and make it runtime
  gma500: resync with Medfield progress
  gma500: Use the mrst helpers and power control for mode commit
  gma500@ Fix backlight range error
  gma500: More Moorestown muddle meddling means MM maybe might modeset
  ...

Fix up fairly trivial conflicts all over, mostly due to header file
cleanup conflicts, but some deleted files and some just context changes:
 - Documentation/feature-removal-schedule.txt
 - drivers/staging/bcm/headers.h
 - drivers/staging/brcm80211/brcmfmac/dhd_linux.c
 - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
 - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
 - drivers/staging/brcm80211/brcmfmac/wl_iw.c
 - drivers/staging/et131x/et131x_netdev.c
 - drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
 - drivers/staging/rtl8192e/r8192E.h
 - drivers/staging/usbip/userspace/src/utils.h
2011-07-25 23:26:34 -07:00
..
displays gma500: Medfield support 2011-07-05 08:20:39 -07:00
accel_2d.c gma500: Move the 2D operations into DRM 2011-07-15 19:05:06 +02:00
backlight.c gma500: fix compile warnings when CONFIG_BACKLIGHT_CLASS_DEVICE is not defined 2011-07-15 19:05:07 +02:00
cdv_device.c gma500: tidy up the CDV files 2011-07-08 13:44:57 -07:00
cdv_device.h gma500: oops.. thou shalt stg add... 2011-07-05 19:51:50 -07:00
cdv_intel_crt.c gma500: tidy up the CDV files 2011-07-08 13:44:57 -07:00
cdv_intel_display.c gma500: tidy up the CDV files 2011-07-08 13:44:57 -07:00
cdv_intel_hdmi.c gma500: Fix unused variable in cdv support 2011-07-08 13:44:58 -07:00
cdv_intel_lvds.c gma500: Fix cdv warning on unused variable 2011-07-15 19:05:07 +02:00
framebuffer.c gma500: Make crtc count a property of the device 2011-07-15 19:05:07 +02:00
framebuffer.h gma500: strip unneeded version headers 2011-07-08 13:44:55 -07:00
gem.c gma500: allow the creation of 'stolen' memory objects 2011-07-15 19:05:06 +02:00
gem_glue.c gma500: Update the GEM todo 2011-07-05 08:20:40 -07:00
gem_glue.h gma500: Move our other GEM helper into the bits want to push into GEM 2011-07-05 08:20:39 -07:00
gtt.c gma500: don't dynamically allocate the psb_gtt struct 2011-07-15 19:05:00 +02:00
gtt.h gma500: don't dynamically allocate the psb_gtt struct 2011-07-15 19:05:00 +02:00
intel_bios.c gma500: Fix missing memory check 2011-07-05 08:20:45 -07:00
intel_bios.h gma500: move the BIOS header 2011-07-05 08:20:44 -07:00
intel_i2c.c gma500: move the i2c code 2011-07-05 08:20:43 -07:00
intel_opregion.c gma500: Fix symbol clash with i915 2011-07-08 13:44:57 -07:00
Kconfig Revert "gma500: Fix dependencies" 2011-07-17 11:13:39 +02:00
Makefile gma500: Clean up the DPU config and make it runtime 2011-07-15 19:05:08 +02:00
mdfld_device.c gma500: Make crtc count a property of the device 2011-07-15 19:05:07 +02:00
mdfld_dsi_dbi.c gma500: Clean up the DPU config and make it runtime 2011-07-15 19:05:08 +02:00
mdfld_dsi_dbi.h gma500: Fix DPU build 2011-07-15 19:12:15 +02:00
mdfld_dsi_dbi_dpu.c gma500: Fix DPU build 2011-07-15 19:12:15 +02:00
mdfld_dsi_dbi_dpu.h gma500: resync with Medfield progress 2011-07-15 19:05:08 +02:00
mdfld_dsi_dpi.c gma500: resync with Medfield progress 2011-07-15 19:05:08 +02:00
mdfld_dsi_dpi.h gma500: resync with Medfield progress 2011-07-15 19:05:08 +02:00
mdfld_dsi_output.c gma500: Clean up the DPU config and make it runtime 2011-07-15 19:05:08 +02:00
mdfld_dsi_output.h gma500: resync with Medfield progress 2011-07-15 19:05:08 +02:00
mdfld_dsi_pkg_sender.c gma500: resync with Medfield progress 2011-07-15 19:05:08 +02:00
mdfld_dsi_pkg_sender.h gma500: resync with Medfield progress 2011-07-15 19:05:08 +02:00
mdfld_intel_display.c gma500: Clean up the DPU config and make it runtime 2011-07-15 19:05:08 +02:00
mdfld_msic.h gma500: Medfield support 2011-07-05 08:20:39 -07:00
mdfld_output.c gma500: Clean up the DPU config and make it runtime 2011-07-15 19:05:08 +02:00
mdfld_output.h gma500: Clean up the DPU config and make it runtime 2011-07-15 19:05:08 +02:00
mdfld_pyr_cmd.c gma500: Clean up the DPU config and make it runtime 2011-07-15 19:05:08 +02:00
mdfld_tmd_vid.c gma500: resync with Medfield progress 2011-07-15 19:05:08 +02:00
mdfld_tpo_cmd.c gma500: Clean up the DPU config and make it runtime 2011-07-15 19:05:08 +02:00
mdfld_tpo_vid.c gma500: Medfield support 2011-07-05 08:20:39 -07:00
medfield.h gma500: Add medfield header 2011-07-16 09:05:38 +02:00
mid_bios.c gma500; clean mid files 2011-07-08 13:44:58 -07:00
mid_bios.h gma500: the 'mrst' BIOS is actually MID generic 2011-07-05 08:20:42 -07:00
mmu.c gma500: the MMU code is also generic 2011-07-05 08:20:43 -07:00
mrst.h gma500: Add the Oaktrail HDMI support 2011-07-15 19:05:08 +02:00
mrst_crtc.c gma500: move the power header 2011-07-05 08:20:44 -07:00
mrst_device.c gma500@ Fix backlight range error 2011-07-15 19:05:08 +02:00
mrst_hdmi.c gma500: Add the Oaktrail HDMI support 2011-07-15 19:05:08 +02:00
mrst_hdmi_i2c.c gma500: Add the Oaktrail HDMI support 2011-07-15 19:05:08 +02:00
mrst_lvds.c gma500: wire up the mrst i2c bus from chip_info 2011-07-15 19:12:15 +02:00
power.c gma500: remove the legacy PM method 2011-07-15 19:05:07 +02:00
power.h gma500: remove the legacy PM method 2011-07-15 19:05:07 +02:00
psb_device.c gma500: Make crtc count a property of the device 2011-07-15 19:05:07 +02:00
psb_drm.h gma500: allow the creation of 'stolen' memory objects 2011-07-15 19:05:06 +02:00
psb_drv.c gma500: Clean up the DPU config and make it runtime 2011-07-15 19:05:08 +02:00
psb_drv.h gma500: resync with Medfield progress 2011-07-15 19:05:08 +02:00
psb_intel_display.c Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
psb_intel_display.h gma500: Medfield support 2011-07-05 08:20:39 -07:00
psb_intel_drv.h gma500: Add the HDMI bits 2011-07-05 08:20:44 -07:00
psb_intel_lvds.c gma500: Use the mrst helpers and power control for mode commit 2011-07-15 19:05:08 +02:00
psb_intel_modes.c staging: gma500: Intel GMA500 staging driver 2011-02-23 13:37:34 -08:00
psb_intel_reg.h gma500: begin adding CDV specific code 2011-07-05 08:20:44 -07:00
psb_intel_sdvo.c gma500: CodingStyle pass 2011-07-05 08:20:39 -07:00
psb_intel_sdvo_regs.h gma500: CodingStyle pass 2011-07-05 08:20:39 -07:00
psb_irq.c gma500: move the power header 2011-07-05 08:20:44 -07:00
psb_irq.h gma500: polish for completion of this phase 2011-07-05 08:20:37 -07:00
psb_lid.c gma500: tidy up the opregion and lid code 2011-07-05 08:20:43 -07:00
psb_reg.h gma500: CodingStyle pass 2011-07-05 08:20:39 -07:00
TODO gma500: Update the TODO list 2011-07-05 19:51:49 -07:00