git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8fed98 5b3e2e1)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 13 Aug 2015 23:23:11 +0000 (16:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 13 Aug 2015 23:23:11 +0000 (16:23 -0700)
Conflicts:
drivers/net/ethernet/cavium/Kconfig

The cavium conflict was overlapping dependency
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge
Pandora Kernel Repository