commit | 9d81a782d55bdeec3bfa3106e514bf46ac12e172 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@g5.osdl.org> | Wed Oct 25 20:22:04 2006 -0700 |
committer | Linus Torvalds <torvalds@g5.osdl.org> | Wed Oct 25 20:22:04 2006 -0700 |
tree | 1b0a77dc95909331eef87a1067c01830bfc6a9c0 | |
parent | 82b6c3af0482c167fb3bb51375589e6d9c5c67a4 [diff] | |
parent | f84fcb06a1f7ab4ac0444ece82b25b0701369641 [diff] |
Merge branch 'intelfb-patches' of master.kernel.org:/pub/scm/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