summaryrefslogtreecommitdiff
path: root/fs/btrfs
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-02-24 22:40:26 (GMT)
committerDave Airlie <airlied@redhat.com>2011-02-24 22:40:26 (GMT)
commit3c0556e9673f79e386b27768e27d18b3ce29e40e (patch)
tree2fd33a82b46f27ff350c0de0b7b1c698c5b64c80 /fs/btrfs
parentfbf92bea68830c12da9099d7c8a60812194efc4e (diff)
parent995073072c2ae72255b595b192cc63f43fd386ef (diff)
downloadlinux-3c0556e9673f79e386b27768e27d18b3ce29e40e.tar.xz
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel into drm-fixes
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel: drm/i915: Fix unintended recursion in ironlake_disable_rc6
Diffstat (limited to 'fs/btrfs')
0 files changed, 0 insertions, 0 deletions