diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-29 08:46:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-29 08:47:05 -0400 |
| commit | e7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a (patch) | |
| tree | 4ba588631dd8189a818a91c9e3976526071178b6 /.gitignore | |
| parent | 1130b0296184bc21806225fd06d533515a99d2db (diff) | |
| parent | 56a50adda49b2020156616c4eb15353e0f9ad7de (diff) | |
Merge branch 'linus' into perfcounters/core
Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
the latest upstream fixes.
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-* |