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)
commitb464f5794619bbe98a92e1bc4180986e39615ac4
tree50f6df06a582b1c6b563af7ffd736a365a7941dd
parentb9d8be7828e974f076717f0da608d052440fe192
parent0fe6e2d2928e089d16ec5ed7ba634c1d60916020
Merge branch 'intelfb-patches' of git://git./linux/kernel/git/airlied/intelfb-2.6

* 'intelfb-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6:
  intelfb delousing