Commit fa0a6024 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote branch 'intel/drm-intel-next' of /ssd/git/drm-next into drm-core-next 

* 'intel/drm-intel-next' of /ssd/git/drm-next: (230 commits)
  drm/i915: Clear the Ironlake dithering flags when the pipe doesn't want it.
  drm/agp/i915: trim stolen space to 32M
  drm/i915: Unset cursor if out-of-bounds upon mode change (v4)
  drm/i915: Unreference object not handle on creation
  drm/i915: Attempt to uncouple object after catastrophic failure in unbind
  drm/i915: Repeat unbinding during free if interrupted (v6)
  drm/i915: Refactor i915_gem_retire_requests()
  drm/i915: Warn if we run out of FIFO space for a mode
  drm/i915: Round up the watermark entries (v3)
  drm/i915: Typo in (unused) register mask for overlay.
  drm/i915: Check overlay stride errata for i830 and i845
  drm/i915: Validate the mode for eDP by using fixed panel size
  drm/i915: Always use the fixed panel timing for eDP
  drm/i915: Enable panel fitting for eDP
  drm/i915: Add fixed panel mode parsed from EDID for eDP without fixed mode in VBT
  drm/i915/sdvo: Set sync polarity based on actual mode
  drm/i915/hdmi: Set sync polarity based on actual mode
  drm/i915/pch: Set transcoder sync polarity for DP based on actual mode
  drm/i915: Initialize LVDS and eDP outputs before anything else
  drm/i915/dp: Correctly report eDP in the core connector type
  ...
parents 4c70b2ea 7b824ec2

Documentation/credentials.txt

+3 −0
Original line number Diff line number Diff line
@@ -417,6 +417,9 @@ reference on them using: 
This does all the RCU magic inside of it.  The caller must call put_cred() on

the credentials so obtained when they're finished with.



 [*] Note: The result of __task_cred() should not be passed directly to

     get_cred() as this may race with commit_cred().



There are a couple of convenience functions to access bits of another task's

credentials, hiding the RCU magic from the caller:

Documentation/feature-removal-schedule.txt

+7 −0
Original line number Diff line number Diff line
@@ -647,3 +647,10 @@ Who: Stefan Richter <stefanr@s5r6.in-berlin.de> 


----------------------------



What:	The acpi_sleep=s4_nonvs command line option

When:	2.6.37

Files:	arch/x86/kernel/acpi/sleep.c

Why:	superseded by acpi_sleep=nonvs

Who:	Rafael J. Wysocki <rjw@sisk.pl>



----------------------------

Documentation/kernel-parameters.txt

+2 −2
Original line number Diff line number Diff line
@@ -254,8 +254,8 @@ and is between 256 and 4096 characters. It is defined in the file 
			control method, with respect to putting devices into

			low power states, to be enforced (the ACPI 2.0 ordering

			of _PTS is used by default).

			s4_nonvs prevents the kernel from saving/restoring the

			ACPI NVS memory during hibernation.

			nonvs prevents the kernel from saving/restoring the

			ACPI NVS memory during suspend/hibernation and resume.

			sci_force_enable causes the kernel to set SCI_EN directly

			on resume from S1/S3 (which is against the ACPI spec,

			but some broken systems don't work without it).

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -6243,6 +6243,8 @@ F: drivers/mmc/host/wbsd.* 


WATCHDOG DEVICE DRIVERS

M:	Wim Van Sebroeck <wim@iguana.be>

L:	linux-watchdog@vger.kernel.org

W:	http://www.linux-watchdog.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git

S:	Maintained

F:	Documentation/watchdog/

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 35

EXTRAVERSION = -rc6

EXTRAVERSION =

NAME = Sheep on Meth



# *DOCUMENTATION*

CRA Git | Maintained and supported by SUSTech CRA and CCSE