From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 May 2010 15:53:57 +0000 (-0700)
Subject: Merge branch 'x86-doc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.35-rc1~515
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=3e1dd193edefd2a806a0ba6cf0879cf1a95217da;hp=-c

Merge branch 'x86-doc-for-linus' of git://git./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
---

3e1dd193edefd2a806a0ba6cf0879cf1a95217da