summaryrefslogtreecommitdiffstats
path: root/drivers/memstick
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-12-22 11:02:06 +0000
committerDave Airlie <airlied@redhat.com>2011-12-22 11:02:06 +0000
commit5d56fe5fd794a98c4f446f8665fd06b82e93ff64 (patch)
tree5d4740d80ecb2e67cf9714d2cc59fbc8405d12ac /drivers/memstick
parent4cf73129cbe001b41be2f8b56f763fbf3acaa4ce (diff)
parentf7b24c42da1a7bbb98145d27aa716d8af3cae2a6 (diff)
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-core-next
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (102 commits) drm/nouveau/ttm: fix crash as a result of a recent ttm change drm/nouveau: Fix notifier blocks over the 4GB mark. drm/nouveau: Fix pushbufs over the 4GB mark. drm/nvc0/pm: initial engine reclocking drm/nouveau: move hpd enable/disable to common code drm/nv40/disp: implement support for hotplug irq drm/nouveau/gpio: reimplement as nouveau_gpio.c, fixing a number of issues drm/nouveau: just pass gpio line to pwm_*, not entire gpio struct drm/nouveau/hwsq: remove some magic, give proper opcode names drm/nv50/pm: introduce hwsq-based memory reclocking drm/nv04/disp: handle dual-link spwg panels without needing quirks drm/nouveau/dp: remove broken display depth function, use the improved one drm/nouveau/mxm: implement ROM shadow method drm/nouveau/mxm: implement _DSM shadow method drm/nouveau/mxm: implement wmi shadow method drm/nouveau/mxm: initial implementation of dcb sanitisation drm/nouveau/disp: parse connector info directly in nouveau_connector.c drm/nouveau/i2c: handle bit-banging ourselves drm/nouveau/i2c: fix debug message drm/nouveau/i2c: tidy up bit-bang helpers, also fixing nv50 setsda bug ...
Diffstat (limited to 'drivers/memstick')
0 files changed, 0 insertions, 0 deletions