From: Linus Torvalds Date: Tue, 10 Jan 2006 16:21:33 +0000 (-0800) Subject: Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild X-Git-Tag: v2.6.16-rc1~474 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ab396e91bfe953db26fa1083d9c3e7a4fbe0334a;p=linux-2.6-omap-h63xx.git Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild Fix up some trivial conflicts in {i386|ia64}/Makefile --- ab396e91bfe953db26fa1083d9c3e7a4fbe0334a