Merge branch 'master' of greg@mail.kroah.net:git/bti
authorGreg Kroah-Hartman <gregkh@suse.de>
Sun, 26 Oct 2008 16:39:02 +0000 (09:39 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sun, 26 Oct 2008 16:39:02 +0000 (09:39 -0700)

Trivial merge