From: Roland Dreier <rolandd@cisco.com>
Date: Tue, 2 Mar 2010 07:51:57 +0000 (-0800)
Subject: Merge branch 'srp' into for-next
X-Git-Tag: v2.6.34-rc1~225^2~1
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=f57721507ffeaf8785f7f17254651de4d8b45e09;p=net-next-2.6.git

Merge branch 'srp' into for-next
---

f57721507ffeaf8785f7f17254651de4d8b45e09