diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-10-08 07:27:11 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-10-08 07:27:11 -0400 |
| commit | bfabb59433fc18ff78d2818e10e212d0f85d56ae (patch) | |
| tree | dd7cbead179c09c62627a84c16c802d99095ba6e /include/asm-generic/vtime.h | |
| parent | 6a08a92ec45782e5543addf5f8785e2560a078f6 (diff) | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af (diff) | |
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.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 */ | |||