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

Commit bd0d1049 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge branch 'staging/for_v3.7' into v4l_for_linus 

* staging/for_v3.7: (2891 commits)
  em28xx: regression fix: use DRX-K sync firmware requests on em28xx
  drxk: allow loading firmware synchrousnously
  em28xx: Make all em28xx extensions to be initialized asynchronously
  [media] tda18271: properly report read errors in tda18271_get_id
  [media] tda18271: delay IR & RF calibration until init() if delay_cal is set
  [media] MAINTAINERS: add Michael Krufky as tda827x maintainer
  [media] MAINTAINERS: add Michael Krufky as tda8290 maintainer
  [media] MAINTAINERS: add Michael Krufky as cxusb maintainer
  [media] MAINTAINERS: add Michael Krufky as lg2160 maintainer
  [media] MAINTAINERS: add Michael Krufky as lgdt3305 maintainer
  [media] MAINTAINERS: add Michael Krufky as mxl111sf maintainer
  [media] MAINTAINERS: add Michael Krufky as mxl5007t maintainer
  [media] MAINTAINERS: add Michael Krufky as tda18271 maintainer
  [media] s5p-tv: Report only multi-plane capabilities in vidioc_querycap
  [media] s5p-mfc: Fix misplaced return statement in s5p_mfc_suspend()
  [media] exynos-gsc: Add missing static storage class specifiers
  [media] exynos-gsc: Remove <linux/version.h> header file inclusion
  [media] s5p-fimc: Fix incorrect condition in fimc_lite_reqbufs()
  [media] s5p-tv: Fix potential NULL pointer dereference error
  [media] s5k6aa: Fix possible NULL pointer dereference
  ...

Conflicts:
	drivers/media/platform/s5p-fimc/fimc-capture.c
	drivers/media/platform/s5p-fimc/fimc-lite.c
parents 89de0f2c 2425bb3d

Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads

0 → 100644
+5 −0
Original line number Diff line number Diff line 
What:		/proc/sys/vm/nr_pdflush_threads

Date:		June 2012

Contact:	Wanpeng Li <liwp@linux.vnet.ibm.com>

Description: Since pdflush is replaced by per-BDI flusher, the interface of old pdflush

             exported in /proc/sys/vm/ should be removed.

Documentation/ABI/testing/sysfs-bus-pci

+12 −0
Original line number Diff line number Diff line
@@ -210,3 +210,15 @@ Users: 
		firmware assigned instance number of the PCI

		device that can help in understanding the firmware

		intended order of the PCI device.



What:		/sys/bus/pci/devices/.../d3cold_allowed

Date:		July 2012

Contact:	Huang Ying <ying.huang@intel.com>

Description:

		d3cold_allowed is bit to control whether the corresponding PCI

		device can be put into D3Cold state.  If it is cleared, the

		device will never be put into D3Cold state.  If it is set, the

		device may be put into D3Cold state if other requirements are

		satisfied too.  Reading this attribute will show the current

		value of d3cold_allowed bit.  Writing this attribute will set

		the value of d3cold_allowed bit.

Documentation/ABI/testing/sysfs-devices-platform-sh_mobile_lcdc_fb

0 → 100644
+44 −0
Original line number Diff line number Diff line 
What:		/sys/devices/platform/sh_mobile_lcdc_fb.[0-3]/graphics/fb[0-9]/ovl_alpha

Date:		May 2012

Contact:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Description:

		This file is only available on fb[0-9] devices corresponding

		to overlay planes.



		Stores the alpha blending value for the overlay. Values range

		from 0 (transparent) to 255 (opaque). The value is ignored if

		the mode is not set to Alpha Blending.



What:		/sys/devices/platform/sh_mobile_lcdc_fb.[0-3]/graphics/fb[0-9]/ovl_mode

Date:		May 2012

Contact:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Description:

		This file is only available on fb[0-9] devices corresponding

		to overlay planes.



		Selects the composition mode for the overlay. Possible values

		are



		0 - Alpha Blending

		1 - ROP3



What:		/sys/devices/platform/sh_mobile_lcdc_fb.[0-3]/graphics/fb[0-9]/ovl_position

Date:		May 2012

Contact:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Description:

		This file is only available on fb[0-9] devices corresponding

		to overlay planes.



		Stores the x,y overlay position on the display in pixels. The

		position format is `[0-9]+,[0-9]+'.



What:		/sys/devices/platform/sh_mobile_lcdc_fb.[0-3]/graphics/fb[0-9]/ovl_rop3

Date:		May 2012

Contact:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Description:

		This file is only available on fb[0-9] devices corresponding

		to overlay planes.



		Stores the raster operation (ROP3) for the overlay. Values

		range from 0 to 255. The value is ignored if the mode is not

		set to ROP3.

Documentation/ABI/testing/sysfs-platform-ideapad-laptop

+11 −0
Original line number Diff line number Diff line
@@ -5,4 +5,15 @@ Contact: "Ike Panhc <ike.pan@canonical.com>" 
Description:

		Control the power of camera module. 1 means on, 0 means off.



What:		/sys/devices/platform/ideapad/fan_mode

Date:		June 2012

KernelVersion:	3.6

Contact:	"Maxim Mikityanskiy <maxtram95@gmail.com>"

Description:

		Change fan mode

		There are four available modes:

			* 0 -> Super Silent Mode

			* 1 -> Standard Mode

			* 2 -> Dust Cleaning

			* 4 -> Efficient Thermal Dissipation Mode

Documentation/DocBook/filesystems.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -224,8 +224,8 @@ all your transactions. 
</para>



<para>

Then at umount time , in your put_super() (2.4) or write_super() (2.5)

you can then call journal_destroy() to clean up your in-core journal object.

Then at umount time , in your put_super() you can then call journal_destroy()

to clean up your in-core journal object.

</para>



<para>