diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-22 11:13:22 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-22 11:13:22 -0700 |
commit | 7da6cd8bdfe13fecc061b868dda57ee1a3a051f4 (patch) | |
tree | c91173fc74f9e66a496296b031728a82835d70b3 /fs/xfs/xfs_utils.h | |
parent | 13c926e04602db207366c7d213dd99d443ac4ad8 (diff) | |
parent | efb896300cc9215f60bb4f7f77f93541ab9f1713 (diff) |
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:
[SPARC32]: Revert f642b263800e6e57c377d630be6d2a999683b579.
[SPARC64]: Need to clobber global reg vars in switch_to().
Diffstat (limited to 'fs/xfs/xfs_utils.h')
0 files changed, 0 insertions, 0 deletions