| commit | 3e1dd193edefd2a806a0ba6cf0879cf1a95217da | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 18 08:53:57 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 18 08:53:57 2010 -0700 |
| tree | d039fa6b38475868ebf2bd63ec14f49031d3f0b2 | |
| parent | 07d77759c95d899b84f8e473a01cff001019dd5f [diff] | |
| parent | 372e22ef0a87d5fc10d387791f9f19721115820c [diff] |
Merge branch 'x86-doc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-doc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, docbook: Fix errors from x86 headers merger