diff options
author | Rob Herring <rob.herring@calxeda.com> | 2013-11-07 20:34:46 +0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2013-11-07 20:34:46 +0400 |
commit | b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24 (patch) | |
tree | b5fcb00387a838beb2bcf2f8ed2fd3d6d460c8ae /include/asm-generic/vtime.h | |
parent | e363bbac316ffb5daaf45d855f82680148cafe20 (diff) | |
parent | 355e62f5ad12b005c862838156262eb2df2f8dff (diff) | |
download | linux-b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24.tar.xz |
Merge remote-tracking branch 'grant/devicetree/next' into for-next
Diffstat (limited to 'include/asm-generic/vtime.h')
-rw-r--r-- | include/asm-generic/vtime.h | 1 |
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 */ |