Subject: Bogus dir.c file introduced at top level.

From: Paul Gortmaker <[email-masked]>
Date: Wed, 19 Feb 2014 13:02:16 -0500

Hi Tiejun,

This merge:

commit a8fa94e0f2ab665f9aa665195618178b61ed8304
Merge: 9561a89 b28a960
Author: Tejun Heo <[email-masked]>
Date:   Mon Feb 10 19:34:30 2014 -0500

    Merge branch 'master' into driver-core-next-test-merge-rc2

introduces a bogus copy of fs/kernfs/dir.c at the top level of
the tree.  Seen in the Feb19th linux-next tree.

Thanks,
Paul.