summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-18 08:53:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-18 08:53:57 -0700
commit3e1dd193edefd2a806a0ba6cf0879cf1a95217da (patch)
treed039fa6b38475868ebf2bd63ec14f49031d3f0b2
parent07d77759c95d899b84f8e473a01cff001019dd5f (diff)
parent372e22ef0a87d5fc10d387791f9f19721115820c (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
0 files changed, 0 insertions, 0 deletions