Merge branch 'work-next' into staging-next

This commit is contained in:
Greg Kroah-Hartman 2011-12-08 12:22:28 -08:00
commit 106e7cf3bd