diff options
author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-05-23 13:48:37 +1000 |
---|---|---|
committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-05-23 13:48:37 +1000 |
commit | c1e554aeea12d2dab5183e011c27dee6142dc927 (patch) | |
tree | a44908fa5c2f1f24b6f7e7313b60e49cd3235cdd /.gitignore | |
parent | c203e45f069af47ca7623e4dcd8c00bfba2722e4 (diff) | |
parent | 78b58e549a3098a8c1408d0214bd25e5d5e7a3a3 (diff) | |
download | blackbird-op-linux-c1e554aeea12d2dab5183e011c27dee6142dc927.tar.gz blackbird-op-linux-c1e554aeea12d2dab5183e011c27dee6142dc927.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 090b293b8779..9c0d650385be 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,5 @@ series cscope.* *.orig -*.rej *~ \#*# |