diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 13:16:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 13:16:33 -0700 |
| commit | c1f792a5bfebcf7ee1d739c3cb9baeaede0160e7 (patch) | |
| tree | 01909604be05d364a80760ff2b4b6cee902b3430 /include/linux/mmc/ioctl.h | |
| parent | 6aaf4404ab2efff2f2f3ee4a5bb5379c1c8092b3 (diff) | |
| parent | 55fb25d5b39320242b41af894921f5cef0c7e293 (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs: (49 commits)
xfs: add size update tracepoint to IO completion
xfs: convert AIL cursors to use struct list_head
xfs: remove confusing ail cursor wrapper
xfs: use a cursor for bulk AIL insertion
xfs: failure mapping nfs fh to inode should return ESTALE
xfs: Remove the second parameter to xfs_sb_count()
xfs: remove the dead XFS_DABUF_DEBUG code
xfs: remove leftovers of the old btree tracing code
xfs: remove the dead QUOTADEBUG code
xfs: remove the unused xfs_buf_delwri_sort function
xfs: remove wrappers around b_iodone
xfs: remove wrappers around b_fspriv
xfs: add a proper transaction pointer to struct xfs_buf
xfs: factor out xfs_da_grow_inode_int
xfs: factor out xfs_dir2_leaf_find_stale
xfs: cleanup struct xfs_dir2_free
xfs: reshuffle dir2 headers
xfs: start periodic workers later
Revert "xfs: fix filesystsem freeze race in xfs_trans_alloc"
xfs: remove variables that serve no purpose in xfs_alloc_ag_vextent_exact()
...
Diffstat (limited to 'include/linux/mmc/ioctl.h')
0 files changed, 0 insertions, 0 deletions