Merge branch 'staging-next' into work
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Jun 2010 22:31:26 +0000 (15:31 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Jun 2010 22:31:26 +0000 (15:31 -0700)

Trivial merge