From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 9 Oct 2013 10:36:13 +0000 (+0200)
Subject: Merge tag 'v3.12-rc4' into sched/core
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~40^2~89
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37bf06375c90a42fe07b9bebdb07bc316ae5a0ce;p=pandora-kernel.git

Merge tag 'v3.12-rc4' into sched/core

Merge Linux v3.12-rc4 to fix a conflict and also to refresh the tree
before applying more scheduler patches.

Conflicts:
	arch/avr32/include/asm/Kbuild

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

37bf06375c90a42fe07b9bebdb07bc316ae5a0ce
Reading git-diff-tree failed