Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 into fbdev-next
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Tue, 13 Mar 2012 23:19:58 +0000 (23:19 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Tue, 13 Mar 2012 23:19:58 +0000 (23:19 +0000)
commit11e184756aad9b609474fa6644266428810da809
tree2bdb2c8f439b787d2be3e904daecf6fc653e21ee
parentf9b4a5ce1a6b3154ff857e17d031473e0bac72d2
parent838ac785d521e091bd8b5f6a2b545166f5f32b77
Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 into fbdev-next
drivers/video/via/hw.c