Merge branch 'trivial-fixes' of https://github.com/agimenez/bti into agimenez-trivial...
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Feb 2011 23:44:16 +0000 (15:44 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Feb 2011 23:44:16 +0000 (15:44 -0800)
Conflicts:
bti.c

.gitignore

index 780cf47170b54dbc3d3e267279873838826be69b..6b1050fff73f77e2367eb6b2ebb371e14005836d 100644 (file)
@@ -23,3 +23,5 @@ stamp-h1
 depcomp
 INSTALL
 check-news.in
+tags
+TAGS