summaryrefslogtreecommitdiff
path: root/drivers/video/matrox
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-21 14:24:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-21 14:24:56 -0700
commit3155fe6df553472fd7c07e7788b0e542cd828c91 (patch)
treeef8179acf58cdeaa54bc7a219168fa98bb5b29c8 /drivers/video/matrox
parentda48524eb20662618854bb3df2db01fc65f3070c (diff)
parent0c9ba97318fc9a905bcc1419b6966de061203a70 (diff)
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs: (23 commits) xfs: don't name variables "panic" xfs: factor agf counter updates into a helper xfs: clean up the xfs_alloc_compute_aligned calling convention xfs: kill support/debug.[ch] xfs: Convert remaining cmn_err() callers to new API xfs: convert the quota debug prints to new API xfs: rename xfs_cmn_err_fsblock_zero() xfs: convert xfs_fs_cmn_err to new error logging API xfs: kill xfs_fs_mount_cmn_err() macro xfs: kill xfs_fs_repair_cmn_err() macro xfs: convert xfs_cmn_err to xfs_alert_tag xfs: Convert xlog_warn to new logging interface xfs: Convert linux-2.6/ files to new logging interface xfs: introduce new logging API. xfs: zero proper structure size for geometry calls xfs: enable delaylog by default xfs: more sensible inode refcounting for ialloc xfs: stop using xfs_trans_iget in the RT allocator xfs: check if device support discard in xfs_ioc_trim() xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1 ...
Diffstat (limited to 'drivers/video/matrox')
0 files changed, 0 insertions, 0 deletions