Merge branch 'linus' into core/locking

D: portions of the Linux Security Module (LSM) framework and security modules

N: Petr Vandrovec

E: vandrove@vc.cvut.cz

E: petr@vandrovec.name

D: Small contributions to ncpfs

D: Matrox framebuffer driver

S: Chudenicka 8

S: 10200 Prague 10, Hostivar

S: Czech Republic

S: 21513 Conradia Ct

S: Cupertino, CA 95014

S: USA

N: Thibaut Varene

E: T-Bone@parisc-linux.org

     <sect1><title>Atomic and pointer manipulation</title>

!Iarch/x86/include/asm/atomic.h

!Iarch/x86/include/asm/unaligned.h

     </sect1>

     <sect1><title>Delaying, scheduling, and timer routines</title>

     </para>

     <sect1><title>String Conversions</title>

!Ilib/vsprintf.c

!Elib/vsprintf.c

     </sect1>

     <sect1><title>String Manipulation</title>

      <function>mutex_lock()</function>

      </para>

      <para>

       There is a <function>mutex_trylock()</function> which can be

       used inside interrupt context, as it will not sleep.

       There is a <function>mutex_trylock()</function> which does not

       sleep.  Still, it must not be used inside interrupt context since

       its implementation is not safe for that.

       <function>mutex_unlock()</function> will also never sleep.

       It cannot be used in interrupt context either since a mutex

       must be released by the same task that acquired it.

      </para>

     </listitem>

    </itemizedlist>

   </sect1>

  </chapter>

  <chapter id="apiref">

   <title>Mutex API reference</title>

!Iinclude/linux/mutex.h

!Ekernel/mutex.c

  </chapter>

  <chapter id="references">

   <title>Further reading</title>

   <title>Block IO</title>

!Iinclude/trace/events/block.h

  </chapter>

  <chapter id="workqueue">

   <title>Workqueue</title>

!Iinclude/trace/events/workqueue.h

  </chapter>

</book>