Merge branch 's3c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux (0a52ac8d) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/filesystems/sysfs.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,8 @@ interface.
		Using sysfs
		~~~~~~~~~~~

		sysfs is always compiled in. You can access it by doing:
		sysfs is always compiled in if CONFIG_SYSFS is defined. You can access
		it by doing:

		mount -t sysfs sysfs /sys

Documentation/sound/alsa/Procfile.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,8 @@ card/pcm/xrun_debug
		bit 0 = Enable XRUN/jiffies debug messages
		bit 1 = Show stack trace at XRUN / jiffies check
		bit 2 = Enable additional jiffies check
		bit 3 = Log hwptr update at each period interrupt
		bit 4 = Log hwptr update at each snd_pcm_update_hw_ptr()

		When the bit 0 is set, the driver will show the messages to
		kernel log when an xrun is detected. The debug message is
		@@ -117,6 +119,9 @@ card/pcm/xrun_debug
		buggy) hardware that doesn't give smooth pointer updates.
		This feature is enabled via the bit 2.

		Bits 3 and 4 are for logging the hwptr records. Note that
		these will give flood of kernel messages.

		card/pcm/sub*/info
		The general information of this PCM sub-stream.

Documentation/video4linux/CARDLIST.em28xx

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		19 -> EM2860/SAA711X Reference Design (em2860)
		20 -> AMD ATI TV Wonder HD 600 (em2880) [0438:b002]
		21 -> eMPIA Technology, Inc. GrabBeeX+ Video Encoder (em2800) [eb1a:2801]
		22 -> Unknown EM2750/EM2751 webcam grabber (em2750) [eb1a:2750,eb1a:2751]
		22 -> EM2710/EM2750/EM2751 webcam grabber (em2750) [eb1a:2750,eb1a:2751]
		23 -> Huaqi DLCW-130 (em2750)
		24 -> D-Link DUB-T210 TV Tuner (em2820/em2840) [2001:f112]
		25 -> Gadmei UTV310 (em2820/em2840)

Documentation/video4linux/gspca.txt

+32 −0

Original line number	Diff line number	Diff line
		@@ -44,7 +44,9 @@ zc3xx 0458:7007 Genius VideoCam V2
		zc3xx 0458:700c Genius VideoCam V3
		zc3xx 0458:700f Genius VideoCam Web V2
		sonixj 0458:7025 Genius Eye 311Q
		sn9c20x 0458:7029 Genius Look 320s
		sonixj 0458:702e Genius Slim 310 NB
		sn9c20x 045e:00f4 LifeCam VX-6000 (SN9C20x + OV9650)
		sonixj 045e:00f5 MicroSoft VX3000
		sonixj 045e:00f7 MicroSoft VX1000
		ov519 045e:028c Micro$oft xbox cam
		@@ -282,6 +284,28 @@ sonixj 0c45:613a Microdia Sonix PC Camera
		sonixj 0c45:613b Surfer SN-206
		sonixj 0c45:613c Sonix Pccam168
		sonixj 0c45:6143 Sonix Pccam168
		sn9c20x 0c45:6240 PC Camera (SN9C201 + MT9M001)
		sn9c20x 0c45:6242 PC Camera (SN9C201 + MT9M111)
		sn9c20x 0c45:6248 PC Camera (SN9C201 + OV9655)
		sn9c20x 0c45:624e PC Camera (SN9C201 + SOI968)
		sn9c20x 0c45:624f PC Camera (SN9C201 + OV9650)
		sn9c20x 0c45:6251 PC Camera (SN9C201 + OV9650)
		sn9c20x 0c45:6253 PC Camera (SN9C201 + OV9650)
		sn9c20x 0c45:6260 PC Camera (SN9C201 + OV7670)
		sn9c20x 0c45:6270 PC Camera (SN9C201 + MT9V011/MT9V111/MT9V112)
		sn9c20x 0c45:627b PC Camera (SN9C201 + OV7660)
		sn9c20x 0c45:627c PC Camera (SN9C201 + HV7131R)
		sn9c20x 0c45:627f PC Camera (SN9C201 + OV9650)
		sn9c20x 0c45:6280 PC Camera (SN9C202 + MT9M001)
		sn9c20x 0c45:6282 PC Camera (SN9C202 + MT9M111)
		sn9c20x 0c45:6288 PC Camera (SN9C202 + OV9655)
		sn9c20x 0c45:628e PC Camera (SN9C202 + SOI968)
		sn9c20x 0c45:628f PC Camera (SN9C202 + OV9650)
		sn9c20x 0c45:62a0 PC Camera (SN9C202 + OV7670)
		sn9c20x 0c45:62b0 PC Camera (SN9C202 + MT9V011/MT9V111/MT9V112)
		sn9c20x 0c45:62b3 PC Camera (SN9C202 + OV9655)
		sn9c20x 0c45:62bb PC Camera (SN9C202 + OV7660)
		sn9c20x 0c45:62bc PC Camera (SN9C202 + HV7131R)
		sunplus 0d64:0303 Sunplus FashionCam DXG
		etoms 102c:6151 Qcam Sangha CIF
		etoms 102c:6251 Qcam xxxxxx VGA
		@@ -290,6 +314,7 @@ spca561 10fd:7e50 FlyCam Usb 100
		zc3xx 10fd:8050 Typhoon Webshot II USB 300k
		ov534 1415:2000 Sony HD Eye for PS3 (SLEH 00201)
		pac207 145f:013a Trust WB-1300N
		sn9c20x 145f:013d Trust WB-3600R
		vc032x 15b8:6001 HP 2.0 Megapixel
		vc032x 15b8:6002 HP 2.0 Megapixel rz406aa
		spca501 1776:501c Arowana 300K CMOS Camera
		@@ -300,4 +325,11 @@ spca500 2899:012c Toptro Industrial
		spca508 8086:0110 Intel Easy PC Camera
		spca500 8086:0630 Intel Pocket PC Camera
		spca506 99fa:8988 Grandtec V.cap
		sn9c20x a168:0610 Dino-Lite Digital Microscope (SN9C201 + HV7131R)
		sn9c20x a168:0611 Dino-Lite Digital Microscope (SN9C201 + HV7131R)
		sn9c20x a168:0613 Dino-Lite Digital Microscope (SN9C201 + HV7131R)
		sn9c20x a168:0618 Dino-Lite Digital Microscope (SN9C201 + HV7131R)
		sn9c20x a168:0614 Dino-Lite Digital Microscope (SN9C201 + MT9M111)
		sn9c20x a168:0615 Dino-Lite Digital Microscope (SN9C201 + MT9M111)
		sn9c20x a168:0617 Dino-Lite Digital Microscope (SN9C201 + MT9M111)
		spca561 abcd:cdee Petcam

arch/alpha/include/asm/tlb.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@

		#include <asm-generic/tlb.h>

		#define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, pte)
		#define __pmd_free_tlb(tlb, pmd) pmd_free((tlb)->mm, pmd)
		#define __pte_free_tlb(tlb, pte, address) pte_free((tlb)->mm, pte)
		#define __pmd_free_tlb(tlb, pmd, address) pmd_free((tlb)->mm, pmd)

		#endif