summaryrefslogtreecommitdiffstats
path: root/arch/cris/include/asm/bitops.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-29 00:23:52 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-29 00:23:52 +0200
commitf21ce8f8447c8be8847dadcfdbcc76b0d7365fa5 (patch)
treefb51d60060453aef9e776c7d3a31588609d34d76 /arch/cris/include/asm/bitops.h
parentMerge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentxfs: add lots of attribute trace points (diff)
downloadlinux-f21ce8f8447c8be8847dadcfdbcc76b0d7365fa5.tar.xz
linux-f21ce8f8447c8be8847dadcfdbcc76b0d7365fa5.zip
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
Pull XFS update (part 2) from Ben Myers: "Fixes for tracing of xfs_name strings, flag handling in open_by_handle, a log space hang with freeze/unfreeze, fstrim offset calculations, a section mismatch with xfs_qm_exit, an oops in xlog_recover_process_iunlinks, and a deadlock in xfs_rtfree_extent. There are also additional trace points for attributes, and the addition of a workqueue for allocation to work around kernel stack size limitations." * 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: add lots of attribute trace points xfs: Fix oops on IO error during xlog_recover_process_iunlinks() xfs: fix fstrim offset calculations xfs: Account log unmount transaction correctly xfs: don't cache inodes read through bulkstat xfs: trace xfs_name strings correctly xfs: introduce an allocation workqueue xfs: Fix open flag handling in open_by_handle code xfs: fix deadlock in xfs_rtfree_extent fs: xfs: fix section mismatch in linux-next
Diffstat (limited to 'arch/cris/include/asm/bitops.h')
0 files changed, 0 insertions, 0 deletions