Merge branch 'intelfb-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airli...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 24 Jun 2006 21:48:35 +0000 (14:48 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 24 Jun 2006 21:48:35 +0000 (14:48 -0700)
* 'intelfb-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6:
  intelfb delousing


Trivial merge