diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-17 15:54:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-17 15:54:56 -0800 |
| commit | 22b4eb5e3174efb49791c62823d0cccc35394c36 (patch) | |
| tree | 7324d6b53ad3c18c244094ad5d51b500716d7304 /arch/um/kernel/ptrace.c | |
| parent | d65773b22b749252b2805dcf96bdeb951a9481d8 (diff) | |
| parent | d060646436233912178e6b9e3a7f30a41214220f (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: cleanup xfs_file_aio_write
xfs: always return with the iolock held from xfs_file_aio_write_checks
xfs: remove the i_new_size field in struct xfs_inode
xfs: remove the i_size field in struct xfs_inode
xfs: replace i_pin_wait with a bit waitqueue
xfs: replace i_flock with a sleeping bitlock
xfs: make i_flags an unsigned long
xfs: remove the if_ext_max field in struct xfs_ifork
xfs: remove the unused dm_attrs structure
xfs: cleanup xfs_iomap_eof_align_last_fsb
xfs: remove xfs_itruncate_data
Diffstat (limited to 'arch/um/kernel/ptrace.c')
0 files changed, 0 insertions, 0 deletions