linux_dsm_epyc7002/arch/openrisc/include/asm
Ingo Molnar 37bf06375c 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>
2013-10-09 12:36:13 +02:00
..
bitops OpenRISC: Headers 2011-07-22 18:46:39 +02:00
asm-offsets.h OpenRISC: Headers 2011-07-22 18:46:39 +02:00
bitops.h Add bitops include needed for ext2 filesystem 2013-02-17 08:46:21 +01:00
cache.h OpenRISC: Memory management 2011-07-22 18:46:28 +02:00
cpuinfo.h OpenRISC: Headers 2011-07-22 18:46:39 +02:00
delay.h OpenRISC: Headers 2011-07-22 18:46:39 +02:00
dma-mapping.h openrisc: provide dma_map_ops 2012-05-08 11:43:51 +02:00
elf.h default SET_PERSONALITY() in linux/elf.h 2013-02-26 02:46:08 -05:00
fixmap.h OpenRISC: Memory management 2011-07-22 18:46:28 +02:00
gpio.h gpiolib/arches: Centralise bolierplate asm/gpio.h 2012-05-11 18:00:14 -06:00
io.h asm-generic/io.h: remove asm/cacheflush.h include 2012-10-25 16:06:57 +02:00
irq.h OpenRISC: IRQ 2011-07-22 18:46:33 +02:00
irqflags.h OpenRISC: IRQ 2011-07-22 18:46:33 +02:00
Kbuild sched, arch: Create asm/preempt.h 2013-09-25 14:07:50 +02:00
linkage.h OpenRISC: Headers 2011-07-22 18:46:39 +02:00
mmu_context.h OpenRISC: Memory management 2011-07-22 18:46:28 +02:00
mmu.h OpenRISC: Memory management 2011-07-22 18:46:28 +02:00
mutex.h OpenRISC: Headers 2011-07-22 18:46:39 +02:00
page.h OpenRISC: Remove memory_start/end prototypes 2012-03-06 10:37:21 +01:00
pgalloc.h OpenRISC: Memory management 2011-07-22 18:46:28 +02:00
pgtable.h consolidate io_remap_pfn_range definitions 2013-06-29 12:46:35 +04:00
processor.h openrisc: remove unused current_regs 2013-02-10 18:55:29 +01:00
prom.h openrisc: clean-up prom.h 2013-09-24 21:12:27 -05:00
ptrace.h UAPI: (Scripted) Disintegrate arch/openrisc/include/asm 2012-10-09 09:47:18 +01:00
serial.h OpenRISC: Headers 2011-07-22 18:46:39 +02:00
spinlock.h OpenRISC: Headers 2011-07-22 18:46:39 +02:00
spr_defs.h OpenRISC: Headers 2011-07-22 18:46:39 +02:00
spr.h OpenRISC: Headers 2011-07-22 18:46:39 +02:00
syscall.h openrisc: sanitize use of orig_gpr11 2012-03-06 10:37:00 +01:00
syscalls.h openrisc: switch to use of generic fork and clone 2012-11-28 23:43:40 -05:00
thread_info.h arch: Consolidate tsk_is_polling() 2013-04-08 17:39:22 +02:00
timex.h OpenRISC: Timekeeping 2011-07-22 18:46:32 +02:00
tlb.h OpenRISC: Memory management 2011-07-22 18:46:28 +02:00
tlbflush.h OpenRISC: Memory management 2011-07-22 18:46:28 +02:00
uaccess.h openrisc: use generic strnlen_user() function 2012-05-27 21:00:32 -07:00
unaligned.h OpenRISC: Headers 2011-07-22 18:46:39 +02:00