| commit | e9011d086674caeedb0ffb6eb5b8bc5920821df3 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Aug 05 18:57:18 2014 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Tue Aug 05 18:57:18 2014 -0700 |
| tree | ed5d06353d8dc1fa5f6da349808f8345ca2291a5 | |
| 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>