tree 42f2465a5f4ad008734ad45d61204d950ece7338
parent dcb92f8804717b845db70939b523c5d152a2e0ea
parent f85da084151c9454891124c999006857a354622a
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1171041756 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1171041756 -0800

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-tc

* '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