Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 (275d3858) · Commits · e / devices / android_kernel_oneplus_sm7250

CREDITS

+16 −1

Original line number	Diff line number	Diff line
		@@ -504,7 +504,7 @@ N: Dominik Brodowski
		E: linux@brodo.de
		W: http://www.brodo.de/
		P: 1024D/725B37C6 190F 3E77 9C89 3B6D BECD 46EE 67C3 0308 725B 37C6
		D: parts of CPUFreq code, ACPI bugfixes
		D: parts of CPUFreq code, ACPI bugfixes, PCMCIA rewrite, cpufrequtils
		S: Tuebingen, Germany

		N: Andries Brouwer
		@@ -857,6 +857,10 @@ S: One Dell Way
		S: Round Rock, TX 78682
		S: USA

		N: Mattia Dongili
		E: malattia@gmail.com
		D: cpufrequtils (precursor to cpupowerutils)

		N: Ben Dooks
		E: ben-linux@fluff.org
		E: ben@simtec.co.uk
		@@ -1883,6 +1887,11 @@ S: Kruislaan 419
		S: 1098 VA Amsterdam
		S: The Netherlands

		N: Goran Koruga
		E: korugag@siol.net
		D: cpufrequtils (precursor to cpupowerutils)
		S: Slovenia

		N: Jiri Kosina
		E: jikos@jikos.cz
		E: jkosina@suse.cz
		@@ -2916,6 +2925,12 @@ S: Schlossbergring 9
		S: 79098 Freiburg
		S: Germany

		N: Thomas Renninger
		E: trenn@suse.de
		D: cpupowerutils
		S: SUSE Linux GmbH
		S: Germany

		N: Joerg Reuter
		E: jreuter@yaina.de
		W: http://yaina.de/jreuter/

Documentation/ABI/testing/sysfs-module

+23 −0

Original line number	Diff line number	Diff line
		@@ -10,3 +10,26 @@ KernelVersion: 2.6.35
		Contact: masa-korg@dsn.okisemi.com
		Description: Write/read Option ROM data.


		What: /sys/module/ehci_hcd/drivers/.../uframe_periodic_max
		Date: July 2011
		KernelVersion: 3.1
		Contact: Kirill Smelkov <kirr@mns.spb.ru>
		Description: Maximum time allowed for periodic transfers per microframe (μs)

		[ USB 2.0 sets maximum allowed time for periodic transfers per
		microframe to be 80%, that is 100 microseconds out of 125
		microseconds (full microframe).

		However there are cases, when 80% max isochronous bandwidth is
		too limiting. For example two video streams could require 110
		microseconds of isochronous bandwidth per microframe to work
		together. ]

		Through this setting it is possible to raise the limit so that
		the host controller would allow allocating more than 100
		microseconds of periodic bandwidth per microframe.

		Beware, non-standard modes are usually not thoroughly tested by
		hardware designers, and the hardware can malfunction when this
		setting differ from default 100.

Documentation/DMA-API-HOWTO.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -613,13 +613,13 @@ to use the dma_sync_*() interfaces.
		pass_to_upper_layers(cp->rx_buf);
		make_and_setup_new_rx_buf(cp);
		} else {
		/* Just sync the buffer and give it back
		* to the card.
		/* CPU should not write to
		* DMA_FROM_DEVICE-mapped area,
		* so dma_sync_single_for_device() is
		* not needed here. It would be required
		* for DMA_BIDIRECTIONAL mapping if
		* the memory was modified.
		*/
		dma_sync_single_for_device(&cp->dev,
		cp->rx_dma,
		cp->rx_len,
		DMA_FROM_DEVICE);
		give_rx_buf_to_card(cp);
		}
		}

Documentation/DocBook/.gitignore

+4 −1

Original line number	Diff line number	Diff line
		@@ -8,4 +8,7 @@
		*.dvi
		*.log
		*.out
		media/
		*.png
		*.gif
		media-indices.tmpl
		media-entities.tmpl

Documentation/DocBook/Makefile

+10 −21

Original line number	Diff line number	Diff line
		@@ -14,7 +14,9 @@ DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \
		genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
		80211.xml debugobjects.xml sh.xml regulator.xml \
		alsa-driver-api.xml writing-an-alsa-driver.xml \
		tracepoint.xml media.xml drm.xml
		tracepoint.xml drm.xml media_api.xml

		include $(srctree)/Documentation/DocBook/media/Makefile

		###
		# The build process is as follows (targets):
		@@ -32,7 +34,7 @@ PS_METHOD = $(prefer-db2x)

		###
		# The targets that may be used.
		PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs xmldoclinks
		PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs

		BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
		xmldocs: $(BOOKS)
		@@ -45,27 +47,14 @@ PDF := $(patsubst %.xml, %.pdf, $(BOOKS))
		pdfdocs: $(PDF)

		HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
		htmldocs: $(HTML) xmldoclinks
		htmldocs: $(HTML)
		$(call build_main_index)
		$(call build_images)
		$(call install_media_images)

		MAN := $(patsubst %.xml, %.9, $(BOOKS))
		mandocs: $(MAN)

		build_images = mkdir -p $(objtree)/Documentation/DocBook/media/ && \
		cp $(srctree)/Documentation/DocBook/dvb/*.png \
		$(srctree)/Documentation/DocBook/v4l/*.gif \
		$(objtree)/Documentation/DocBook/media/

		xmldoclinks:
		ifneq ($(objtree),$(srctree))
		for dep in dvb media-entities.tmpl media-indices.tmpl v4l; do \
		rm -f $(objtree)/Documentation/DocBook/$$dep \
		&& ln -s $(srctree)/Documentation/DocBook/$$dep $(objtree)/Documentation/DocBook/ \
		\|\| exit; \
		done
		endif

		installmandocs: mandocs
		mkdir -p /usr/local/man/man9/
		install Documentation/DocBook/man/*.9.gz /usr/local/man/man9/
		@@ -97,7 +86,7 @@ define rule_docproc
		) > $(dir $@).$(notdir $@).cmd
		endef

		%.xml: %.tmpl xmldoclinks FORCE
		%.xml: %.tmpl FORCE
		$(call if_changed_rule,docproc)

		###
		@@ -150,7 +139,7 @@ quiet_cmd_db2pdf = PDF $@

		index = index.html
		main_idx = Documentation/DocBook/$(index)
		build_main_index = rm -rf $(main_idx) && \
		build_main_index = rm -rf $(main_idx); \
		echo '<h1>Linux Kernel HTML Documentation</h1>' >> $(main_idx) && \
		echo '<h2>Kernel Version: $(KERNELVERSION)</h2>' >> $(main_idx) && \
		cat $(HTML) >> $(main_idx)
		@@ -242,7 +231,7 @@ clean-files := $(DOCBOOKS) \

		clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man

		cleandocs:
		cleandocs: cleanmediadocs
		$(Q)rm -f $(call objectify, $(clean-files))
		$(Q)rm -rf $(call objectify, $(clean-dirs))