]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/gpu/drm/nouveau/nv50_fbcon.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
authorDavid S. Miller <davem@davemloft.net>
Sun, 20 Feb 2011 00:42:37 +0000 (16:42 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 20 Feb 2011 00:42:37 +0000 (16:42 -0800)
commitece639caa33c85c8805fa4a0a5955b8de9c95346
tree5b8d613601c2e01e876a7d241923e90a0e759c3b
parent0cc9d5257857608ba85885b75fcada13d359b5d1
parent0af320fb4627033e49cbc6e8138e7aa75ab8352a
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6