[linux_logo/el4: 25/25] Merge branch 'master' into el4

[Matthias Saou]

commit 5a7dcc398254ec074630daf436f772ee02c4fc57
Merge: 1586bd1 4d17931
Author: Matthias Saou <thias at marmotte.net>
Date:   Mon Jul 11 10:11:28 2011 +0200

    Merge branch 'master' into el4

 .gitignore                  |    2 +-
 linux_logo-4.12-debug.patch |   12 ------------
 linux_logo.spec             |   27 ++++++++++++++++++---------
 sources                     |    2 +-
 4 files changed, 20 insertions(+), 23 deletions(-)
---
diff --cc .gitignore
index 9f201b1,faa9648..1b718a6
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- linux_logo-5.06.tar.gz
 -linux_logo-5.10.tar.gz
+ /linux_logo-5.11.tar.gz