diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-10 15:49:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-10 15:49:10 -0700 |
| commit | aa98936e4f423dc2706771368598b04870059d14 (patch) | |
| tree | 5b503225ee28f4b9648354db54eb29f4c097c140 /fs/btrfs | |
| parent | 082b63ae45e7d14e15995dedd782ec7344596fb2 (diff) | |
| parent | 0c23590f00f85467b318ad0c20c36796a5bd4c60 (diff) | |
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, 64-bit: ifdef out struct thread_struct::ip
x86, 32-bit: ifdef out struct thread_struct::fs
x86: clean up alternative.h
Diffstat (limited to 'fs/btrfs')
0 files changed, 0 insertions, 0 deletions