Permalink
Browse files

Merge branch 'master' of github.com:gregkh/gregkh-linux

Conflicts:
	stable/.gitignore
  • Loading branch information...
2 parents c6dd6f5 + 8cd388d commit bdc1639cf324e8dffa893175c4bc8fd73109496c @gregkh committed Nov 22, 2011
Showing with 1 addition and 3 deletions.
  1. +1 −3 stable/.gitignore
View
@@ -1,11 +1,9 @@
linux-2.6*
linux-3.*
+linux-stable
stable-queue
linux-stable
release-*
-for_27
-for_28
-for_31
old
s
x/

0 comments on commit bdc1639

Please sign in to comment.