Merge branch 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 26 Oct 2006 03:22:04 +0000 (20:22 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 26 Oct 2006 03:22:04 +0000 (20:22 -0700)
commit9d81a782d55bdeec3bfa3106e514bf46ac12e172
tree1b0a77dc95909331eef87a1067c01830bfc6a9c0
parent82b6c3af0482c167fb3bb51375589e6d9c5c67a4
parentf84fcb06a1f7ab4ac0444ece82b25b0701369641
Merge branch 'intelfb-patches' of /linux/kernel/git/airlied/intelfb-2.6

* 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6:
  Remove unnecessary check in drivers/video/intelfb/intelfbhw.c
  intel fb: switch to pci_get API