ToastFreeware Gitweb - gregoa/bti.git/commit

author	Greg Kroah-Hartman <gregkh@suse.de>
	Wed, 28 Jul 2010 00:31:13 +0000 (17:31 -0700)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Wed, 28 Jul 2010 00:31:13 +0000 (17:31 -0700)
commit	3cf0485f9da7fdbb02a65aa4dafe7754df1f5220
tree	54f860317644e6817f5e2e1874089f03ac7eb684	tree \| snapshot
parent	b093827e79dfb914ebbd57a2b61d7795f5bfa316	commit \| diff
parent	d2e529255104430b2b49dccb5ef83336999c3288	commit \| diff

Merge branch 'master' into oath-test

Conflicts:
bti.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>