From: Linus Torvalds Date: Wed, 4 Oct 2006 17:43:31 +0000 (-0700) Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus X-Git-Tag: v2.6.19-rc1~17 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5170065d8af2c102ca940303416579606bc7ff51;p=linux-2.6-omap-h63xx.git Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/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 --- 5170065d8af2c102ca940303416579606bc7ff51