summaryrefslogtreecommitdiffstats
path: root/drivers/w1
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-25 20:22:04 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-25 20:22:04 -0700
commit9d81a782d55bdeec3bfa3106e514bf46ac12e172 (patch)
tree1b0a77dc95909331eef87a1067c01830bfc6a9c0 /drivers/w1
parent82b6c3af0482c167fb3bb51375589e6d9c5c67a4 (diff)
parentf84fcb06a1f7ab4ac0444ece82b25b0701369641 (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
Diffstat (limited to 'drivers/w1')
0 files changed, 0 insertions, 0 deletions