From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 22 Aug 2013 00:23:54 +0000 (+1000)
Subject: Merge remote-tracking branch 'ipsec/master'
X-Git-Tag: next-20130822~127
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1ef97f51ea193c105a1abc33ab64f5383cc29ded;p=karo-tx-linux.git

Merge remote-tracking branch 'ipsec/master'
---

1ef97f51ea193c105a1abc33ab64f5383cc29ded