From: Linus Walleij <linus.walleij@linaro.org>
Date: Sat, 19 Oct 2013 21:24:03 +0000 (+0200)
Subject: Merge tag 'v3.12-rc6' into devel
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~12^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b41fb43911b4cb864812adec88d028cc6219f23e;p=pandora-kernel.git

Merge tag 'v3.12-rc6' into devel

Linux 3.12-rc6

Conflicts:
	drivers/gpio/gpio-lynxpoint.c
---

b41fb43911b4cb864812adec88d028cc6219f23e
Reading git-diff-tree failed