Merge branch 'fix-segfault-invalid-host' of https://github.com/agimenez/bti into...
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Feb 2011 23:47:29 +0000 (15:47 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Feb 2011 23:47:29 +0000 (15:47 -0800)
1  2 
bti.c

diff --cc bti.c
Simple merge