tree d7bbd8e24bd312d9c2c18fc18f12f6a8ce9b084f
parent c472273f863c80b87e53356256c5466df24328f0
parent 656e6c0050fd63ce42c55a6cb454a9b4b2f9ccf7
author Linus Torvalds <torvalds@linux-foundation.org> 1224184696 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1224184696 -0700

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