tree 27bf5c64fbda8ed7796de52d495982fc30a56c8b
parent 2ca7d674d7ab2220707b2ada0b690c0e7c95e7ac
parent 6c19efb46aacf2c5043ad210b888ee58ffb848c0
author Linus Torvalds <torvalds@linux-foundation.org> 1252975952 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1252975952 -0700

Merge branch 'docs-next' of git://git.lwn.net/linux-2.6

* 'docs-next' of git://git.lwn.net/linux-2.6:
  Document the flex_array library.
  Doc: seq_file.txt fix wrong dd command example.