From: Linus Torvalds Date: Thu, 31 May 2007 16:14:12 +0000 (-0700) Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 X-Git-Tag: v2.6.22-rc4~69 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0e9871df2389560e94ba01e40959140ee56def4b;p=linux-2.6-omap-h63xx.git Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: Missing #include in drivers/sbus/char/flash.c [SPARC32]: Build fix. [SPARC64]: Add missing NCS and SVC hypervisor interfaces. --- 0e9871df2389560e94ba01e40959140ee56def4b