diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /.gitignore | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore index 946c7ec5c922..a2939fc10b22 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -22,6 +22,7 @@ | |||
| 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 |
| @@ -33,26 +34,26 @@ | |||
| 33 | # | 34 | # |
| 34 | # Top-level generic files | 35 | # Top-level generic files |
| 35 | # | 36 | # |
| 36 | tags | 37 | /tags |
| 37 | TAGS | 38 | /TAGS |
| 38 | vmlinux | 39 | /linux |
| 39 | System.map | 40 | /vmlinux |
| 40 | Module.markers | 41 | /vmlinuz |
| 41 | Module.symvers | 42 | /System.map |
| 43 | /Module.markers | ||
| 44 | /Module.symvers | ||
| 45 | |||
| 46 | # | ||
| 47 | # git files that we don't want to ignore even it they are dot-files | ||
| 48 | # | ||
| 42 | !.gitignore | 49 | !.gitignore |
| 43 | !.mailmap | 50 | !.mailmap |
| 44 | 51 | ||
| 45 | # | 52 | # |
| 46 | # Generated include files | 53 | # Generated include files |
| 47 | # | 54 | # |
| 48 | include/asm | ||
| 49 | include/asm-*/asm-offsets.h | ||
| 50 | include/config | 55 | include/config |
| 51 | include/linux/autoconf.h | ||
| 52 | include/linux/compile.h | ||
| 53 | include/linux/version.h | 56 | include/linux/version.h |
| 54 | include/linux/utsrelease.h | ||
| 55 | include/linux/bounds.h | ||
| 56 | include/generated | 57 | include/generated |
| 57 | 58 | ||
| 58 | # stgit generated dirs | 59 | # stgit generated dirs |