summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv04_fbcon.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-11 14:07:00 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-11 14:07:00 -0800
commitffaa60d5fe1d30b618b0feb22c79486c26a16ea0 (patch)
treee4c2d26c7565c7cee36065753db09467a27e0339 /drivers/gpu/drm/nouveau/nv04_fbcon.c
parentefa82bab8e3509bb2c4a8044de5909b8bab96cfd (diff)
parent531c2dc70d339c5dfa8c3eb628c3459dc6f3a075 (diff)
downloadblackbird-op-linux-ffaa60d5fe1d30b618b0feb22c79486c26a16ea0.tar.gz
blackbird-op-linux-ffaa60d5fe1d30b618b0feb22c79486c26a16ea0.zip
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: cciss: Make cciss_seq_show handle holes in the h->drv[] array cfq-iosched: split seeky coop queues after one slice
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_fbcon.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud