tree f9875bcf01aec2f264ed7b198fc29aa4e1eafd50
parent 6f5621cb160fada5bc52c2961ddc86e69e478912
parent 99659a929d653d0c9ce458091870544768add871
author Linus Torvalds <torvalds@linux-foundation.org> 1267383655 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1267383655 -0800

Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/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()