Merge branch 'master' of github.com:gregkh/bti
authorGreg Kroah-Hartman <gregkh@suse.de>
Sun, 8 May 2011 19:20:35 +0000 (12:20 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sun, 8 May 2011 19:20:35 +0000 (12:20 -0700)
1  2 
bti.c

diff --cc bti.c
Simple merge