]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit3064b47165eb22bedbccd70e66881bf0099b2a5b
treeed5d06353d8dc1fa5f6da349808f8345ca2291a5
parentad8e339cd0304b7b0f268a12da67205e69706d93
parent7e582d9bffbea0504195b03e0a8e124a1c64b711
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>
arch/sparc/mm/init_64.c