Merge branch 'master' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/bti
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 5 May 2009 05:49:48 +0000 (22:49 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 5 May 2009 05:49:48 +0000 (22:49 -0700)

Trivial merge