summaryrefslogtreecommitdiffstats
path: root/fs/ceph/ceph_frag.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-21 11:00:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-21 11:00:30 -0700
commit0ffe37de76a57ba38d960e370c2f8f1d799c94a1 (patch)
treee771211305987dc4123fbcd68cff46bc8f3f0c60 /fs/ceph/ceph_frag.c
parent4e24db5b1a8fe0b0afab875ad2facdfaedce7b07 (diff)
parentdb8c076b9206ea35b1f7299708d5510b17674db2 (diff)
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel: drm/i915: Hold a reference to the object whilst unbinding the eviction list drm/i915,agp/intel: Add second set of PCI-IDs for B43 drm/i915: Fix Sandybridge fence registers drm/i915/crt: Downgrade warnings for hotplug failures drm/i915: Ensure that the crtcinfo is populated during mode_fixup()
Diffstat (limited to 'fs/ceph/ceph_frag.c')
0 files changed, 0 insertions, 0 deletions