diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-06 13:42:33 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-06 13:42:33 -0400 |
| commit | 00dd7b7d26a3bf3780cfcebfdde2b86126b3a082 (patch) | |
| tree | 5129fd1abc99d0c58a520938f28bf330ae94ef30 /.gitignore | |
| parent | 58b3ac07fed31ffc1349380b78305af6522fe1f4 (diff) | |
| parent | 6e1e63259b1e01f047796e7985d960ca040993e6 (diff) | |
Merge ../linux-2.6
Conflicts:
arch/ia64/hp/sim/simscsi.c
Stylistic differences in two separate fixes for buffer->request_buffer
problem.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 27fd37621255..b1f5b9df2ae1 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -30,6 +30,11 @@ include/config | |||
| 30 | include/linux/autoconf.h | 30 | include/linux/autoconf.h |
| 31 | include/linux/compile.h | 31 | include/linux/compile.h |
| 32 | include/linux/version.h | 32 | include/linux/version.h |
| 33 | include/linux/utsrelease.h | ||
| 33 | 34 | ||
| 34 | # stgit generated dirs | 35 | # stgit generated dirs |
| 35 | patches-* | 36 | patches-* |
| 37 | |||
| 38 | # quilt's files | ||
| 39 | patches | ||
| 40 | series | ||