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

Commit 81e53d04 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branches 'topic/sc18is602' and 'topic/rspi' of... 

Merge branches 'topic/sc18is602' and 'topic/rspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-bpw
parents 15e0964d fcb4ed74

CREDITS

+5 −0
Original line number Original line Diff line number Diff line
@@ -655,6 +655,11 @@ S: Stanford University 
S: Stanford, California 94305

S: Stanford, California 94305

S: USA

S: USA





N: Carlos Chinea

E: carlos.chinea@nokia.com

E: cch.devel@gmail.com

D: Author of HSI Subsystem



N: Randolph Chung

N: Randolph Chung

E: tausq@debian.org

E: tausq@debian.org

D: Linux/PA-RISC hacker

D: Linux/PA-RISC hacker

Documentation/Changes

+0 −11
Original line number Original line Diff line number Diff line
@@ -196,13 +196,6 @@ chmod 0644 /dev/cpu/microcode 
as root before you can use this.  You'll probably also want to

as root before you can use this.  You'll probably also want to

get the user-space microcode_ctl utility to use with this.

get the user-space microcode_ctl utility to use with this.





Powertweak

----------



If you are running v0.1.17 or earlier, you should upgrade to

version v0.99.0 or higher. Running old versions may cause problems

with programs using shared memory.



udev

udev

----

----

udev is a userspace application for populating /dev dynamically with

udev is a userspace application for populating /dev dynamically with
@@ -366,10 +359,6 @@ Intel P6 microcode 
------------------

------------------

o  <http://www.urbanmyth.org/microcode/>

o  <http://www.urbanmyth.org/microcode/>





Powertweak

----------

o  <http://powertweak.sourceforge.net/>



udev

udev

----

----

o <http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html>

o <http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html>

Documentation/DocBook/device-drivers.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ 
     </sect1>

     </sect1>

     <sect1><title>Wait queues and Wake events</title>

     <sect1><title>Wait queues and Wake events</title>

!Iinclude/linux/wait.h

!Iinclude/linux/wait.h

!Ekernel/wait.c

!Ekernel/sched/wait.c

     </sect1>

     </sect1>

     <sect1><title>High-resolution timers</title>

     <sect1><title>High-resolution timers</title>

!Iinclude/linux/ktime.h

!Iinclude/linux/ktime.h

Documentation/DocBook/media/v4l/vidioc-expbuf.xml

+5 −3
Original line number Original line Diff line number Diff line
@@ -73,7 +73,8 @@ range from zero to the maximal number of valid planes for the currently active 
format. For the single-planar API, applications must set <structfield> plane

format. For the single-planar API, applications must set <structfield> plane

</structfield> to zero.  Additional flags may be posted in the <structfield>

</structfield> to zero.  Additional flags may be posted in the <structfield>

flags </structfield> field.  Refer to a manual for open() for details.

flags </structfield> field.  Refer to a manual for open() for details.

Currently only O_CLOEXEC is supported.  All other fields must be set to zero.

Currently only O_CLOEXEC, O_RDONLY, O_WRONLY, and O_RDWR are supported.  All

other fields must be set to zero.

In the case of multi-planar API, every plane is exported separately using

In the case of multi-planar API, every plane is exported separately using

multiple <constant> VIDIOC_EXPBUF </constant> calls. </para>

multiple <constant> VIDIOC_EXPBUF </constant> calls. </para>
@@ -170,8 +171,9 @@ multi-planar API. Otherwise this value must be set to zero. </entry> 
	    <entry>__u32</entry>

	    <entry>__u32</entry>

	    <entry><structfield>flags</structfield></entry>

	    <entry><structfield>flags</structfield></entry>

	    <entry>Flags for the newly created file, currently only <constant>

	    <entry>Flags for the newly created file, currently only <constant>

O_CLOEXEC </constant> is supported, refer to the manual of open() for more

O_CLOEXEC </constant>, <constant>O_RDONLY</constant>, <constant>O_WRONLY

details.</entry>

</constant>, and <constant>O_RDWR</constant> are supported, refer to the manual

of open() for more details.</entry>

	  </row>

	  </row>

	  <row>

	  <row>

	    <entry>__s32</entry>

	    <entry>__s32</entry>

Documentation/assoc_array.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -164,10 +164,10 @@ This points to a number of methods, all of which need to be provided: 




 (4) Diff the index keys of two objects.

 (4) Diff the index keys of two objects.





	int (*diff_objects)(const void *a, const void *b);

	int (*diff_objects)(const void *object, const void *index_key);





     Return the bit position at which the index keys of two objects differ or

     Return the bit position at which the index key of the specified object

     -1 if they are the same.

     differs from the given index key or -1 if they are the same.









 (5) Free an object.

 (5) Free an object.