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


Trivial merge