Merge branch 'work-next' into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Feb 2012 23:24:04 +0000 (15:24 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Feb 2012 23:24:04 +0000 (15:24 -0800)

Trivial merge