From: Linus Torvalds Date: Fri, 11 Apr 2008 20:24:16 +0000 (-0700) Subject: Merge branch 'docs' of git://git.lwn.net/linux-2.6 X-Git-Tag: v2.6.25-rc9~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=14897e35fdc045fff9baabf0354570da22386706;p=linux-2.6-omap-h63xx.git Merge branch 'docs' of git://git.lwn.net/linux-2.6 * 'docs' of git://git.lwn.net/linux-2.6: Add additional examples in Documentation/spinlocks.txt Move sched-rt-group.txt to scheduler/ Documentation: move rpc-cache.txt to filesystems/ Documentation: move nfsroot.txt to filesystems/ Spell out behavior of atomic_dec_and_lock() in kerneldoc Fix a typo in highres.txt Fixes to the seq_file document Fill out information on patch tags in SubmittingPatches Add the seq_file documentation --- 14897e35fdc045fff9baabf0354570da22386706