diff options
author | Dave Airlie <airlied@redhat.com> | 2012-05-01 13:25:06 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-05-01 13:25:06 +0200 |
commit | e6586240a66e38dff2fbefd89451cfcdd68dceac (patch) | |
tree | 2561e0d9a91469172bc1fa44c139c075b1886387 /fs/reiserfs | |
parent | Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm (diff) | |
parent | drm/nv10/gpio: fix thinko in mask for gpio lines 2-9 (diff) | |
download | linux-e6586240a66e38dff2fbefd89451cfcdd68dceac.tar.xz linux-e6586240a66e38dff2fbefd89451cfcdd68dceac.zip |
Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
* 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6:
drm/nv10/gpio: fix thinko in mask for gpio lines 2-9
nvc0/fb: shut up PMFB interrupt after the first occurrence
drm/nouveau/hdmi: use correct hdmi regs for nvaa/nvac
drm/nouveau/bios: fix regression on some nv4x board
Diffstat (limited to 'fs/reiserfs')
0 files changed, 0 insertions, 0 deletions