summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-29 23:45:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-29 23:45:06 -0700
commit983236b5741e557451f3ed4ec5ebf1f62a5b2c15 (patch)
tree2b9872f659ac73df93fdaeca4d37654a5a84d4fc /drivers/media/video
parent74aec4e0dd93d4202d3d5a692723f39cc5332b15 (diff)
parenta5a7bbcc0137e5cdad21cce0962f6be0b7ecf173 (diff)
downloadlinux-983236b5741e557451f3ed4ec5ebf1f62a5b2c15.tar.bz2
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: Fix build breakage in xfs_iops.c when CONFIG_FS_POSIX_ACL is not set
Diffstat (limited to 'drivers/media/video')
0 files changed, 0 insertions, 0 deletions