linux-next: manual merge of the arm-soc tree with Linus' tree

[Stephen Rothwell]

Hi Arnd,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/net/ethernet/cadence/Kconfig between commit eccab1ec87d0
("net/cadence: enable by default NET_ATMEL") from Linus' tree and commit
f75ba50bdc2b ("macb: initial support for Cadence GEM") from the arm-soc
tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/net/ethernet/cadence/Kconfig
index b48378a,a2e1500..0000000
--- a/drivers/net/ethernet/cadence/Kconfig
+++ b/drivers/net/ethernet/cadence/Kconfig
@@@ -5,9 -5,8 +5,9 @@@
  config HAVE_NET_MACB
  	bool
  
- config NET_ATMEL
- 	bool "Atmel devices"
+ config NET_CADENCE
+ 	bool "Cadence devices"
 +	default y
  	depends on HAVE_NET_MACB || (ARM && ARCH_AT91RM9200)
  	---help---
  	  If you have a network (Ethernet) card belonging to this class, say Y.

Attachment: pgp00000.pgp
Description: PGP signature