diff options
author | Alex Elder <aelder@sgi.com> | 2010-05-19 16:59:23 +0200 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2010-05-19 16:59:23 +0200 |
commit | e9cee8e6549b669080e9a7d02b8387086a5c911d (patch) | |
tree | 292ee423003343833a9f0f6dbf7f870b977b8b1e /arch/ia64/kernel/topology.c | |
parent | Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
parent | xfs: mark xfs_iomap_write_ helpers static (diff) | |
download | linux-e9cee8e6549b669080e9a7d02b8387086a5c911d.tar.xz linux-e9cee8e6549b669080e9a7d02b8387086a5c911d.zip |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/ia64/kernel/topology.c')
0 files changed, 0 insertions, 0 deletions