diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 21:16:32 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 21:16:32 -0700 |
commit | 7f0852f959d8e92786c684ebd7fee3332a2f4efe (patch) | |
tree | 0fc9278f4094ba5e9c84c3c22608469f77393a2e /drivers/block/viodasd.c | |
parent | 2f1b9250516aa8744496abbbbb8a6066cb2b56db (diff) | |
parent | f01cfb3638a2f1ee584913f37e5ba7a8abfed8de (diff) |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6 of HEAD
* HEAD:
[PATCH] w1: remove drivers/w1/w1.h
[PATCH] w1: fix idle check loop in ds2482
[PATCH] W1: remove w1 mail list from lm_sensors.
Diffstat (limited to 'drivers/block/viodasd.c')
0 files changed, 0 insertions, 0 deletions