ucc_geth: Fix sneaky merge conflict regarding bus_id
[linux-2.6] / drivers / net / fec_8xx / Kconfig
2005-10-29  Pantelis Antoniou[PATCH] fec_8xx: Remove dependency on NETTA & NETPHONE
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2