Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-tc
Linus Torvalds [Fri, 9 Feb 2007 17:22:36 +0000 (09:22 -0800)]
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-tc:
  [EISA] EISA registration with !CONFIG_EISA
  [TC] pmagb-b-fb: Convert to the driver model
  [TC] dec_esp: Driver model for the PMAZ-A
  [TC] mips: pmag-ba-fb: Convert to the driver model
  [TC] defxx: TURBOchannel support
  [TC] TURBOchannel support for the DECstation
  [TC] MIPS: TURBOchannel resources off-by-one fix
  [TC] MIPS: TURBOchannel update to the driver model

1  2 
MAINTAINERS
drivers/net/Kconfig

diff --cc MAINTAINERS
Simple merge
Simple merge