projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cfcfe22 c78f77e)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorDavid S. Miller <davem@davemloft.net>
Wed, 6 Aug 2014 01:57:18 +0000 (18:57 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Aug 2014 01:57:18 +0000 (18:57 -0700)
commite9011d086674caeedb0ffb6eb5b8bc5920821df3
treeed5d06353d8dc1fa5f6da349808f8345ca2291a5tree | snapshot
parentcfcfe22256d5a8a14924a1145d56017b043b554fcommit | diff
parentc78f77e20d2ba5d4d5e478e85a6fb42556893e2dcommit | diff
Merge git://git./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>
arch/sparc/mm/init_64.c diff1 | diff2 | blob | history
John Crispins staging tree