linux-uconsole/arch/openrisc/kernel
Amit Pundir 24740dab5c Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

Conflicts:
    fs/f2fs/extent_cache.c
        Pick changes from AOSP Change-Id: Icd8a85ac0c19a8aa25cd2591a12b4e9b85bdf1c5
        ("f2fs: catch up to v4.14-rc1")

    fs/f2fs/namei.c
        Pick changes from AOSP F2FS backport commit 7d5c08fd91
        ("f2fs: backport from (4c1fad64 - Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)")
2018-03-05 20:20:17 +05:30
..
asm-offsets.c openrisc: use kbuild.h instead of defining macros in asm-offset.c 2012-10-25 15:54:33 +02:00
dma.c openrisc: provide dma_map_ops 2012-05-08 11:43:51 +02:00
entry.S openrisc: Rework signal handling 2014-01-09 10:57:21 +01:00
head.S openrisc: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:33 -08:00
irq.c openrisc: Get rid of handle_IRQ 2014-09-03 13:11:02 +00:00
Makefile openrisc: Use generic idle loop 2013-04-08 17:39:27 +02:00
module.c openrisc: Refactor 16-bit constant relocation 2013-11-05 16:27:55 +01:00
or32_ksyms.c OpenRISC: Miscellaneous 2011-07-22 18:46:41 +02:00
process.c whack-a-mole: no need to set_fs(USER_DS) in {start,flush}_thread() 2015-04-11 22:24:31 -04:00
prom.c openrisc: remove unnecessary prom.c includes 2013-10-09 11:39:01 -05:00
ptrace.c ARCH: AUDIT: audit_syscall_entry() should not require the arch 2014-09-23 16:21:26 -04:00
setup.c openrisc: remove use of seq_printf return value 2015-04-15 16:35:25 -07:00
signal.c arch: Remove exec_domain from remaining archs 2015-04-12 21:03:30 +02:00
sys_call_table.c OpenRISC: System calls 2011-07-22 18:46:34 +02:00
time.c openrisc/time: Migrate to new 'set-state' interface 2015-08-10 11:41:02 +02:00
traps.c signal/openrisc: Fix do_unaligned_access to send the proper signal 2018-02-16 20:09:46 +01:00
vmlinux.h of/fdt: consolidate built-in dtb section variables 2014-04-30 00:59:13 -05:00
vmlinux.lds.S UPSTREAM: arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections 2018-01-22 13:15:43 +05:30