diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /.gitignore | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 3f8fb686b59c..27fd37621255 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | # | 16 | # |
| 17 | # Top-level generic files | 17 | # Top-level generic files |
| 18 | # | 18 | # |
| 19 | tags | ||
| 19 | vmlinux* | 20 | vmlinux* |
| 20 | System.map | 21 | System.map |
| 21 | Module.symvers | 22 | Module.symvers |
| @@ -30,3 +31,5 @@ include/linux/autoconf.h | |||
| 30 | include/linux/compile.h | 31 | include/linux/compile.h |
| 31 | include/linux/version.h | 32 | include/linux/version.h |
| 32 | 33 | ||
| 34 | # stgit generated dirs | ||
| 35 | patches-* | ||