Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Manually resolve conflict in include/mtd/Kbuild

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/Kbuild b/Kbuild
index 2d4f95e4b8..0451f69353 100644
--- a/Kbuild
+++ b/Kbuild
@@ -28,7 +28,7 @@ define cmd_offsets
          echo "/*"; \
          echo " * DO NOT MODIFY."; \
          echo " *"; \
-         echo " * This file was generated by $(srctree)/Kbuild"; \
+         echo " * This file was generated by Kbuild"; \
          echo " *"; \
          echo " */"; \
          echo ""; \