summaryrefslogtreecommitdiff
path: root/drivers/w1/w1.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-24 09:32:07 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-24 09:32:07 -0700
commit32bd33e21eeab63e7265bb3cba9ed94ab1ab816e (patch)
treec22b1dc22bdf57c586c1fb86f202353a061a7564 /drivers/w1/w1.c
parent4bf3631cdb012591667ab927fcd7719d92837833 (diff)
parent01abc2aa0f447bce2f6beb06dd0607ba0f01c5bb (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: Revert "adjust legacy IDE resource setting (v2)"
Diffstat (limited to 'drivers/w1/w1.c')
0 files changed, 0 insertions, 0 deletions