Conflicts:
include/linux/ssb/ssb_driver_gige.h
Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/-
bgmac.c due to change of an API.
|
||
|---|---|---|
| .. | ||
| irq.c | ||
| Kconfig | ||
| Makefile | ||
| nvram.c | ||
| Platform | ||
| prom.c | ||
| serial.c | ||
| setup.c | ||
| sprom.c | ||
| time.c | ||
| wgt634u.c | ||