tree de572dd6d3955b0725001776a7b03796f99e1e8e
parent 6bfa687c19b7ab8adee03f0d43c197c2945dd869
parent d0e639c9e06d44e713170031fe05fb60ebe680af
author Ingo Molnar <mingo@kernel.org> 1381314973 +0200
committer Ingo Molnar <mingo@kernel.org> 1381314973 +0200
mergetag object d0e639c9e06d44e713170031fe05fb60ebe680af
 type commit
 tag v3.12-rc4
 tagger Linus Torvalds <torvalds@linux-foundation.org> 1381093235 -0700
 
 Linux 3.12-rc4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQEcBAABAgAGBQJSUc9zAAoJEHm+PkMAQRiG9DMH/AtpuAF6LlMRPjrCeuJQ1pyh
 T0IUO+CsLKO6qtM5IyweP8V6zaasNjIuW1+B6IwVIl8aOrM+M7CwRiKvpey26ldM
 I8G2ron7hqSOSQqSQs20jN2yGAqQGpYIbTmpdGLAjQ350NNNvEKthbP5SZR5PAmE
 UuIx5OGEkaOyZXvCZJXU9AZkCxbihlMSt2zFVxybq2pwnGezRUYgCigE81aeyE0I
 QLwzzMVdkCxtZEpkdJMpLILAz22jN4RoVDbXRa2XC7dA9I2PEEXI9CcLzqCsx2Ii
 8eYS+no2K5N2rrpER7JFUB2B/2X8FaVDE+aJBCkfbtwaYTV9UYLq3a/sKVpo1Cs=
 =xSFJ
 -----END PGP SIGNATURE-----

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>