From: Brian Norris <computersforpeace@gmail.com>
Date: Mon, 15 Sep 2014 23:28:16 +0000 (-0700)
Subject: Merge tag 'v3.17-rc5' from upstream
X-Git-Tag: v3.18-rc1~25^2~32
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7622d4905a038961da6b1c6c3fe4be6c3dad7ef9;p=karo-tx-linux.git

Merge tag 'v3.17-rc5' from upstream
---

7622d4905a038961da6b1c6c3fe4be6c3dad7ef9