From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Feb 2013 00:26:52 +0000 (+1100)
Subject: Merge remote-tracking branch 'galak/next'
X-Git-Tag: next-20130220~103
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5c4fe18e0ecee0bf95331f6754399c0a252411a5;p=karo-tx-linux.git

Merge remote-tracking branch 'galak/next'

Conflicts:
	Documentation/devicetree/bindings/crypto/fsl-sec4.txt
---

5c4fe18e0ecee0bf95331f6754399c0a252411a5