summaryrefslogtreecommitdiffstats
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
parent873ee9ed2c020b59e22a5082f73fc2960ec959bf (diff)
parentd0e639c9e06d44e713170031fe05fb60ebe680af (diff)
downloadtalos-obmc-linux-263c43a4479ecce52c0fdc84b4620e146263d549.tar.gz
talos-obmc-linux-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 */
OpenPOWER on IntegriCloud