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

Commit 6124a4e4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'imx/dt' into next/dt

parents 8e267f3d 580975d7
Loading
Loading
Loading
Loading
+5 −0
Original line number Original line Diff line number Diff line
@@ -45,6 +45,11 @@ modules.builtin
/Module.markers
/Module.markers
/Module.symvers
/Module.symvers


#
# Debian directory (make deb-pkg)
#
/debian/

#
#
# git files that we don't want to ignore even it they are dot-files
# git files that we don't want to ignore even it they are dot-files
#
#
+1 −2
Original line number Original line Diff line number Diff line
@@ -73,8 +73,7 @@ Linas Vepstas <linas@austin.ibm.com>
Mark Brown <broonie@sirena.org.uk>
Mark Brown <broonie@sirena.org.uk>
Matthieu CASTET <castet.matthieu@free.fr>
Matthieu CASTET <castet.matthieu@free.fr>
Mayuresh Janorkar <mayur@ti.com>
Mayuresh Janorkar <mayur@ti.com>
Michael Buesch <mb@bu3sch.de>
Michael Buesch <m@bues.ch>
Michael Buesch <mbuesch@freenet.de>
Michel Dänzer <michel@tungstengraphics.com>
Michel Dänzer <michel@tungstengraphics.com>
Mitesh shah <mshah@teja.com>
Mitesh shah <mshah@teja.com>
Morten Welinder <terra@gnome.org>
Morten Welinder <terra@gnome.org>
+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ Why: /proc/<pid>/oom_adj allows userspace to influence the oom killer's


	A much more powerful interface, /proc/<pid>/oom_score_adj, was
	A much more powerful interface, /proc/<pid>/oom_score_adj, was
	introduced with the oom killer rewrite that allows users to increase or
	introduced with the oom killer rewrite that allows users to increase or
	decrease the badness() score linearly.  This interface will replace
	decrease the badness score linearly.  This interface will replace
	/proc/<pid>/oom_adj.
	/proc/<pid>/oom_adj.


	A warning will be emitted to the kernel log if an application uses this
	A warning will be emitted to the kernel log if an application uses this
+21 −0
Original line number Original line Diff line number Diff line
What:		/sys/bus/i2c/devices/.../device
Date:		February 2011
Contact:	Minkyu Kang <mk7.kang@samsung.com>
Description:
		show what device is attached
		NONE - no device
		USB - USB device is attached
		UART - UART is attached
		CHARGER - Charger is attaced
		JIG - JIG is attached

What:		/sys/bus/i2c/devices/.../switch
Date:		February 2011
Contact:	Minkyu Kang <mk7.kang@samsung.com>
Description:
		show or set the state of manual switch
		VAUDIO - switch to VAUDIO path
		UART - switch to UART path
		AUDIO - switch to AUDIO path
		DHOST - switch to DHOST path
		AUTO - switch automatically by device
+23 −0
Original line number Original line Diff line number Diff line
@@ -10,3 +10,26 @@ KernelVersion: 2.6.35
Contact:	masa-korg@dsn.okisemi.com
Contact:	masa-korg@dsn.okisemi.com
Description:	Write/read Option ROM data.
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.
Loading