From: James Bottomley <jejb@titanic.(none)>
Date: Fri, 20 May 2005 20:27:44 +0000 (-0500)
Subject: merge by hand - fix up rejections in Documentation/DocBook/Makefile
X-Git-Tag: v2.6.13-rc1~90^2~583^2~62^2^2~27^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672;p=pandora-kernel.git

merge by hand - fix up rejections in Documentation/DocBook/Makefile
---

ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672
Reading git-diff-tree failed