Ingo Molnar fb10d5b7ef Merge branch 'linus' into sched/core ... Resolve cherry-picking conflicts: Conflicts: mm/huge_memory.c mm/memory.c mm/mprotect.c See this upstream merge commit for more details: 52469b4fcd Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Signed-off-by: Ingo Molnar <mingo@kernel.org>		2013-11-01 08:24:41 +01:00
..
boot	sparc: Fix piggyback with newer binutils.	2012-12-03 11:24:25 -08:00
configs	perf: Remove PERF_COUNTERS config option	2012-04-26 13:52:52 +02:00
crypto	sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in CAMELLIA code.	2012-12-19 15:44:31 -08:00
include	Merge branch 'core/urgent' into sched/core	2013-10-11 07:39:37 +02:00
kernel	sparc: fix MSI build failure on Sparc32	2013-10-02 20:02:35 -04:00
lib	sparc64: Remove RWSEM export leftovers	2013-09-05 12:12:51 -07:00
math-emu	sparc64: Make montmul/montsqr/mpmul usable in 32-bit threads.	2012-10-26 15:18:37 -07:00
mm	arch: mm: pass userspace fault flag to generic fault handler	2013-09-12 15:38:01 -07:00
net	net: fix unsafe set_memory_rw from softirq	2013-10-07 15:16:45 -04:00
oprofile	sparc: using HZ needs an include of linux/param.h	2009-10-05 00:46:08 -07:00
power	sparc64: Hibernation support	2013-03-20 11:06:54 -07:00
prom	arch: sparc: prom: looping issue, need additional length check in the outside looping	2013-06-19 02:10:29 -07:00
Kbuild	sparc64: Add SHA1 driver making use of the 'sha1' instruction.	2012-08-20 15:08:49 -07:00
Kconfig	sparc: fix MSI build failure on Sparc32	2013-10-02 20:02:35 -04:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Makefile	sparc64: Hibernation support	2013-03-20 11:06:54 -07:00