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

Commit fa251f89 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier 



Conflicts:
	block/blk-core.c
	drivers/block/loop.c
	mm/swapfile.c

Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parents dd3932ed cd07202c

CREDITS

+4 −4
Original line number Diff line number Diff line
@@ -3554,12 +3554,12 @@ E: cvance@nai.com 
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

Documentation/DocBook/device-drivers.tmpl

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 


     <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>

Documentation/DocBook/kernel-api.tmpl

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 
     </para>



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

!Ilib/vsprintf.c

!Elib/vsprintf.c

     </sect1>

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

Documentation/DocBook/kernel-locking.tmpl

+6 −0
Original line number Diff line number Diff line
@@ -1961,6 +1961,12 @@ machines due to caching. 
   </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>

Documentation/DocBook/tracepoint.tmpl

+5 −0
Original line number Diff line number Diff line
@@ -104,4 +104,9 @@ 
   <title>Block IO</title>

!Iinclude/trace/events/block.h

  </chapter>



  <chapter id="workqueue">

   <title>Workqueue</title>

!Iinclude/trace/events/workqueue.h

  </chapter>

</book>