diff options
| author | James Morris <jmorris@namei.org> | 2009-05-08 03:56:47 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-05-08 03:56:47 -0400 |
| commit | d254117099d711f215e62427f55dfb8ebd5ad011 (patch) | |
| tree | 0848ff8dd74314fec14a86497f8d288c86ba7c65 /.gitignore | |
| parent | 07ff7a0b187f3951788f64ae1f30e8109bc8e9eb (diff) | |
| parent | 8c9ed899b44c19e81859fbb0e9d659fe2f8630fc (diff) | |
Merge branch 'master' into next
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 869e1a3b64b6..51bd99d6a260 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -49,6 +49,7 @@ include/linux/compile.h | |||
| 49 | include/linux/version.h | 49 | include/linux/version.h |
| 50 | include/linux/utsrelease.h | 50 | include/linux/utsrelease.h |
| 51 | include/linux/bounds.h | 51 | include/linux/bounds.h |
| 52 | include/generated | ||
| 52 | 53 | ||
| 53 | # stgit generated dirs | 54 | # stgit generated dirs |
| 54 | patches-* | 55 | patches-* |