From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 27 Jan 2014 13:44:53 +0000 (-0800)
Subject: Merge branch 'master' into staging-next
X-Git-Tag: v3.14-rc1~13^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc11f372e9371ec3a3dad02396dbe0a55eec0b8f;p=pandora-kernel.git

Merge branch 'master' into staging-next

We need the network changes in staging-next in order to be able to fix
up the rtl8821ae driver to build properly.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

cc11f372e9371ec3a3dad02396dbe0a55eec0b8f
Reading git-diff-tree failed