diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:17:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:17:34 -0400 |
| commit | 44347d947f628060b92449702071bfe1d31dfb75 (patch) | |
| tree | c6ed74610d5b3295df4296659f80f5feb94b28cc /.gitignore | |
| parent | d94fc523f3c35bd8013f04827e94756cbc0212f4 (diff) | |
| parent | 413f81eba35d6ede9289b0c8a920c013a84fac71 (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on a .30-rc1 base and was missing out on
on a handful of tracing fixes present in .30-rc5-almost.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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-* |