diff options
| author | David S. Miller <davem@davemloft.net> | 2014-08-05 21:57:18 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-05 21:57:18 -0400 |
| commit | e9011d086674caeedb0ffb6eb5b8bc5920821df3 (patch) | |
| tree | ed5d06353d8dc1fa5f6da349808f8345ca2291a5 /arch/s390/kernel/head_kdump.S | |
| parent | cfcfe22256d5a8a14924a1145d56017b043b554f (diff) | |
| parent | c78f77e20d2ba5d4d5e478e85a6fb42556893e2d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Conflicts:
arch/sparc/mm/init_64.c
Conflict was simple non-overlapping additions.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/s390/kernel/head_kdump.S')
0 files changed, 0 insertions, 0 deletions