From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 5 Aug 2013 05:53:04 +0000 (+1000)
Subject: Merge remote-tracking branch 'aio/master'
X-Git-Tag: next-20130805~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ff6c196a31474fc31ea2f36b1d8f0f0564a9c8af;p=karo-tx-linux.git

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

ff6c196a31474fc31ea2f36b1d8f0f0564a9c8af