Merge branch 'soc-part2' into soc

This commit is contained in:
Tony Lindgren 2012-01-20 05:41:41 -08:00
commit 5405520d08
3 changed files with 92 additions and 110 deletions