diff options
| author | David S. Miller <davem@davemloft.net> | 2014-08-06 03:57:18 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-06 03:57:18 +0200 |
| commit | e9011d086674caeedb0ffb6eb5b8bc5920821df3 (patch) | |
| tree | ed5d06353d8dc1fa5f6da349808f8345ca2291a5 /arch/s390/defconfig | |
| parent | Merge branch 'sparc64_io' (diff) | |
| parent | sparc: Add "install" target (diff) | |
| download | linux-e9011d086674caeedb0ffb6eb5b8bc5920821df3.tar.xz linux-e9011d086674caeedb0ffb6eb5b8bc5920821df3.zip | |
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/defconfig')
0 files changed, 0 insertions, 0 deletions