Ingo Molnar f407a82586 Merge branch 'linus' into sched/core, to resolve conflict ... Conflicts: arch/sparc/include/asm/topology_64.h Signed-off-by: Ingo Molnar <mingo@kernel.org>		2015-06-02 08:05:42 +02:00
..
boot	xtensa: xtfpga: add audio card to xtfpga DTS	2015-02-07 11:21:39 +03:00
configs	xtensa: xtfpga: provide defconfig with audio subsystem	2015-02-07 12:52:12 +03:00
include	xtensa: Provide dummy dma_alloc_attrs() and dma_free_attrs()	2015-05-25 23:03:16 +00:00
kernel	Xtensa changes and fixes for 4.1	2015-04-17 15:32:30 -04:00
lib	xtensa: clean up files to make them code-style compliant	2012-12-18 21:10:25 -08:00
mm	mm/fault, arch: Use pagefault_disable() to check for disabled pagefaults in the handler	2015-05-19 08:39:15 +02:00
oprofile	xtensa: fix oprofile building as module	2013-05-09 01:07:09 -07:00
platforms	Xtensa improvements for 4.1:	2015-04-14 04:47:53 +00:00
variants	xtensa: remove s6000 variant and s6105 platform	2014-10-21 13:29:01 +04:00
Kconfig	xtensa: xtfpga: fix hardware lockup caused by LCD driver	2015-02-27 07:55:29 +03:00
Kconfig.debug	xtensa: disable link optimization	2014-12-15 23:47:24 -08:00
Makefile	xtensa: remove s6000 variant and s6105 platform	2014-10-21 13:29:01 +04:00