summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-28 11:00:55 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-28 11:00:55 -0800
commit30ff056c42c665b9ea535d8515890857ae382540 (patch)
treef9875bcf01aec2f264ed7b198fc29aa4e1eafd50 /fs
parent6f5621cb160fada5bc52c2961ddc86e69e478912 (diff)
parent99659a929d653d0c9ce458091870544768add871 (diff)
downloadconfigs-30ff056c42c665b9ea535d8515890857ae382540.tar.gz
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()
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions