aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-generic/vtime.h
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-10-16 10:05:53 +0200
committerLinus Walleij <linus.walleij@linaro.org>2013-10-16 10:05:53 +0200
commit263c43a4479ecce52c0fdc84b4620e146263d549 (patch)
treeb29ad7d94892be7a40524400481f71a1c075a167 /include/asm-generic/vtime.h
parentpinctrl: coh901: mark GPIO lines used for IRQ (diff)
parentLinux 3.12-rc4 (diff)
downloadlinux-dev-263c43a4479ecce52c0fdc84b4620e146263d549.tar.xz
linux-dev-263c43a4479ecce52c0fdc84b4620e146263d549.zip
Merge tag 'v3.12-rc4' into devel
Linux 3.12-rc4
Diffstat (limited to 'include/asm-generic/vtime.h')
-rw-r--r--include/asm-generic/vtime.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/vtime.h b/include/asm-generic/vtime.h
index e69de29bb2d1..b1a49677fe25 100644
--- a/include/asm-generic/vtime.h
+++ b/include/asm-generic/vtime.h
@@ -0,0 +1 @@
+/* no content, but patch(1) dislikes empty files */