summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-02-02 11:29:02 +1000
committerDave Airlie <airlied@redhat.com>2011-02-02 11:29:02 +1000
commite98ce0d7cfa6ee0650a63d45558a5121383995d9 (patch)
tree40cc68e8a16dda2b6d4193bdf44194a5def3bbc3 /fs
parenta55205e229e4e16559cc2593fdfc37902b248879 (diff)
parentc4534fdf5603ef53fce2f418df7b5a19e71281e3 (diff)
downloadlinux-stable-e98ce0d7cfa6ee0650a63d45558a5121383995d9.tar.gz
linux-stable-e98ce0d7cfa6ee0650a63d45558a5121383995d9.tar.bz2
linux-stable-e98ce0d7cfa6ee0650a63d45558a5121383995d9.zip
Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into drm-fixes
* 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next: drm/nv50: fix display on 0x50 drm/nouveau: correctly pair hwmon_init and hwmon_fini
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions