Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 4 Oct 2006 17:43:31 +0000 (10:43 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 4 Oct 2006 17:43:31 +0000 (10:43 -0700)
commit5170065d8af2c102ca940303416579606bc7ff51
treecdf113cb04be06d0d3afc8df06acc628208dbcdd
parentab8e823515305a93715e71b81efcbe27c6ce0f59
parentc4710e65c005339b5979fa258bf89940dc2a700b
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Remove remaining reference to ite_gpio.h from Kbuild
  [MIPS] PNX8550 fixups