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)
commitd77d22da5257c11cc06df0291ec2d2996bb8603b
tree1aeb9dc3097e9e03392c462052acd049bddf6f2a
parente14fa66ad8e52500503395e75fd07d07ce2a3ddd
parent7fb56a1cc530beccd2c7126f21b7d347f5596614
Merge branch 'trivial-fixes' of https://github.com/agimenez/bti into agimenez-trivial-fixes

Conflicts:
bti.c