From: Linus Torvalds Date: Sun, 28 Feb 2010 19:00:55 +0000 (-0800) Subject: Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v2.6.34-rc1~248 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30ff056c42c665b9ea535d8515890857ae382540;p=pandora-kernel.git Merge branch 'x86-uv-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, uv: Remove recursion in uv_heartbeat_enable() x86, uv: uv_global_gru_mmr_address() macro fix x86, uv: Add serial number parameter to uv_bios_get_sn_info() --- 30ff056c42c665b9ea535d8515890857ae382540 Reading git-diff-tree failed