From: Linus Torvalds Date: Thu, 16 Oct 2008 19:18:16 +0000 (-0700) Subject: Merge branch 'docs' of git://git.lwn.net/linux-2.6 X-Git-Tag: v2.6.28-rc1~287 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d1b5726358ccebcf614fc9f97cdf3354178dcb80;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: Document panic_on_unrecovered_nmi sysctl Add a reference to paper to SubmittingPatches Add kerneldoc documentation for new printk format extensions Remove videobook.tmpl doc: Test-by? Add the development process document Documentation/block/data-integrity.txt: Fix section numbers --- d1b5726358ccebcf614fc9f97cdf3354178dcb80