Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfa9d178 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'devfreq-for-next' of... 

Merge branch 'devfreq-for-next' of git://git.infradead.org/users/kmpark/linux-samsung into pm-devfreq

* 'devfreq-for-next' of git://git.infradead.org/users/kmpark/linux-samsung: (765 commits)
  PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412.
  pci: Fix hotplug of Express Module with pci bridges
  i2c-eg20t: correct the driver init order of pch_i2c_probe()
  I2C: OMAP: fix FIFO usage for OMAP4
  i2c-s3c2410: Fix return code of s3c24xx_i2c_parse_dt_gpio
  i2c: i2c-s3c2410: Add a cpu_relax() to busy wait for bus idle
  Linux 3.2-rc6
  Revert "drm/i915: fix infinite recursion on unbind due to ilk vt-d w/a"
  btrfs: lower the dirty balance poll interval
  drm/i915/dp: Dither down to 6bpc if it makes the mode fit
  drm/i915: enable semaphores on per-device defaults
  drm/i915: don't set unpin_work if vblank_get fails
  drm/i915: By default, enable RC6 on IVB and SNB when reasonable
  iommu: Export intel_iommu_enabled to signal when iommu is in use
  drm/i915/sdvo: Include LVDS panels for the IS_DIGITAL check
  drm/i915: prevent division by zero when asking for chipset power
  drm/i915: add PCH info to i915_capabilities
  drm/i915: set the right SDVO transcoder for CPT
  drm/i915: no-lvds quirk for ASUS AT5NM10T-I
  sched: Fix select_idle_sibling() regression in selecting an idle SMT sibling
  ...
parents 3f19f08a 7b405038

CREDITS

+6 −3
Original line number Original line Diff line number Diff line
@@ -688,10 +688,13 @@ S: Oxfordshire, UK. 




N: Kees Cook

N: Kees Cook

E: kees@outflux.net

E: kees@outflux.net

W: http://outflux.net/

E: kees@ubuntu.com

P: 1024D/17063E6D 9FA3 C49C 23C9 D1BC 2E30  1975 1FFF 4BA9 1706 3E6D

E: keescook@chromium.org

D: Minor updates to SCSI types, added /proc/pid/maps protection

W: http://outflux.net/blog/

P: 4096R/DC6DC026 A5C3 F68F 229D D60F 723E  6E13 8972 F4DF DC6D C026

D: Various security things, bug fixes, and documentation.

S: (ask for current address)

S: (ask for current address)

S: Portland, Oregon

S: USA

S: USA





N: Robin Cornelius

N: Robin Cornelius

Documentation/ABI/testing/sysfs-bus-rbd

+0 −7
Original line number Original line Diff line number Diff line
@@ -57,13 +57,6 @@ create_snap 




	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create

	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create





rollback_snap



	Rolls back data to the specified snapshot. This goes over the entire

	list of rados blocks and sends a rollback command to each.



	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_rollback



snap_*

snap_*





	A directory per each snapshot

	A directory per each snapshot

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ qcom Qualcomm, Inc. 
ramtron	Ramtron International

ramtron	Ramtron International

samsung	Samsung Semiconductor

samsung	Samsung Semiconductor

schindler	Schindler

schindler	Schindler

sil	Silicon Image

simtek

simtek

sirf	SiRF Technology, Inc.

sirf	SiRF Technology, Inc.

stericsson	ST-Ericsson

stericsson	ST-Ericsson

Documentation/filesystems/btrfs.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -63,8 +63,8 @@ IRC network. 
Userspace tools for creating and manipulating Btrfs file systems are

Userspace tools for creating and manipulating Btrfs file systems are

available from the git repository at the following location:

available from the git repository at the following location:





 http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs-unstable.git

 http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs.git

 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs-unstable.git

 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git





These include the following tools:

These include the following tools:

Documentation/kernel-parameters.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -315,12 +315,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			CPU-intensive style benchmark, and it can vary highly in

			CPU-intensive style benchmark, and it can vary highly in

			a microbenchmark depending on workload and compiler.

			a microbenchmark depending on workload and compiler.





			1: only for 32-bit processes

			32: only for 32-bit processes

			2: only for 64-bit processes

			64: only for 64-bit processes

			on: enable for both 32- and 64-bit processes

			on: enable for both 32- and 64-bit processes

			off: disable for both 32- and 64-bit processes

			off: disable for both 32- and 64-bit processes





	amd_iommu=	[HW,X86-84]

	amd_iommu=	[HW,X86-64]

			Pass parameters to the AMD IOMMU driver in the system.

			Pass parameters to the AMD IOMMU driver in the system.

			Possible values are:

			Possible values are:

			fullflush - enable flushing of IO/TLB entries when

			fullflush - enable flushing of IO/TLB entries when