0da608d052440fe192 parent 0fe6e2d2928e089d16ec5ed7ba634c1d60916020 author Linus Torvalds 1151185715 -0700 committer Linus Torvalds 1151185715 -0700 Merge branch 'intelfb-patches' of git://git.kernel.org/pub/scm/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 1ðšh™