Subject: linux-next: manual merge of the kbuild tree with the kernel-doc tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 26 May 2010 11:53:46 +1000

Hi Michal,

Today's linux-next merge of the kbuild tree got a conflict in
Documentation/kbuild/makefiles.txt between commit
74bb7003010ff0998e280a6ade09381168ff20ec
("docs-kbuild-make-examples-content2") from the kernel-doc tree and
commit e8d400a933fa44e2fba3849b084e1ae5814d7fca ("kbuild: fix a couple of
typos in Documentation") from the kbuild tree.

The former also fixed the typo, so I used that.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/