diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-02-21 14:17:22 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-21 14:17:22 -0500 |
| commit | 5f854cfc024622e4aae14d7cf422f6ff86278688 (patch) | |
| tree | 426e77c6f6e4939c80440bf1fabcb020e3ee145b /.gitignore | |
| parent | cc24da0742870f152ddf1002aa39dfcd83f7cf9c (diff) | |
| parent | 4ec62b2b2e6bd7ddef7b6cea6e5db7b5578a6532 (diff) | |
Forward to 2.6.33-rc8
Merge branch 'linus' into rt/head with a pile of conflicts.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index b93fb7eff942..de6344e15706 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -22,9 +22,11 @@ | |||
| 22 | *.lst | 22 | *.lst |
| 23 | *.symtypes | 23 | *.symtypes |
| 24 | *.order | 24 | *.order |
| 25 | modules.builtin | ||
| 25 | *.elf | 26 | *.elf |
| 26 | *.bin | 27 | *.bin |
| 27 | *.gz | 28 | *.gz |
| 29 | *.bz2 | ||
| 28 | *.lzma | 30 | *.lzma |
| 29 | *.patch | 31 | *.patch |
| 30 | *.gcno | 32 | *.gcno |
| @@ -35,6 +37,7 @@ | |||
| 35 | tags | 37 | tags |
| 36 | TAGS | 38 | TAGS |
| 37 | vmlinux | 39 | vmlinux |
| 40 | vmlinuz | ||
| 38 | System.map | 41 | System.map |
| 39 | Module.markers | 42 | Module.markers |
| 40 | Module.symvers | 43 | Module.symvers |
| @@ -44,14 +47,8 @@ Module.symvers | |||
| 44 | # | 47 | # |
| 45 | # Generated include files | 48 | # Generated include files |
| 46 | # | 49 | # |
| 47 | include/asm | ||
| 48 | include/asm-*/asm-offsets.h | ||
| 49 | include/config | 50 | include/config |
| 50 | include/linux/autoconf.h | ||
| 51 | include/linux/compile.h | ||
| 52 | include/linux/version.h | 51 | include/linux/version.h |
| 53 | include/linux/utsrelease.h | ||
| 54 | include/linux/bounds.h | ||
| 55 | include/generated | 52 | include/generated |
| 56 | 53 | ||
| 57 | # stgit generated dirs | 54 | # stgit generated dirs |