Merge branch 'srp' into for-next

This commit is contained in:
Roland Dreier 2010-03-01 23:51:57 -08:00
commit f57721507f
2 changed files with 65 additions and 32 deletions