diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /fs/udf/udftime.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/udf/udftime.c')
| -rw-r--r-- | fs/udf/udftime.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/udf/udftime.c b/fs/udf/udftime.c index b8c828c4d200..1f11483eba6a 100644 --- a/fs/udf/udftime.c +++ b/fs/udf/udftime.c | |||
| @@ -34,9 +34,10 @@ | |||
| 34 | * http://www.boulder.nist.gov/timefreq/pubs/bulletin/leapsecond.htm | 34 | * http://www.boulder.nist.gov/timefreq/pubs/bulletin/leapsecond.htm |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #include "udfdecl.h" | ||
| 38 | |||
| 37 | #include <linux/types.h> | 39 | #include <linux/types.h> |
| 38 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
| 39 | #include "udfdecl.h" | ||
| 40 | 41 | ||
| 41 | #define EPOCH_YEAR 1970 | 42 | #define EPOCH_YEAR 1970 |
| 42 | 43 | ||