Merge branch 'master' into oath
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Jun 2010 23:31:15 +0000 (16:31 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Jun 2010 23:31:15 +0000 (16:31 -0700)

Trivial merge