diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-12 20:27:53 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-12 20:27:53 +1000 |
| commit | a68a9c4c1fff8e2bf7779eb95699d32ccdacb036 (patch) | |
| tree | e31c8765a2648f168ce2429f14c7844d35d364cd /arch/unicore32/kernel/fpu-ucf64.c | |
| parent | 73140a1678b891f772301ebd7561bba16cd528d4 (diff) | |
| parent | 4ace53bb3d31bb1e75d3501bd31b3f1e8585a115 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/machine_kexec_64.c
drivers/block/zram/zram_drv.c
drivers/staging/android/lowmemorykiller.c
Diffstat (limited to 'arch/unicore32/kernel/fpu-ucf64.c')
0 files changed, 0 insertions, 0 deletions