Arnd Bergmann 3642a0a2c7 Merge branch 'mxs/saif' into next/drivers ...

Conflicts:
	drivers/net/ethernet/cadence/Kconfig

2011-12-06 14:23:35 +00:00

..

at91_ether.c

macb: unify at91 and avr32 platform data

2011-11-22 15:21:16 +00:00

at91_ether.h

macb: unify at91 and avr32 platform data

2011-11-22 15:21:16 +00:00

Kconfig

Merge branch 'mxs/saif' into next/drivers

2011-12-06 14:23:35 +00:00

macb.c

macb: allow GEM to have configurable receive buffer size

2011-11-22 15:21:20 +00:00

macb.h

macb: allow GEM to have configurable receive buffer size

2011-11-22 15:21:20 +00:00

Makefile

macb: Move the Atmel driver

2011-08-12 12:38:26 -07:00