From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 13 Jul 2006 04:16:32 +0000 (-0700)
Subject: Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6 of HEAD
X-Git-Tag: v2.6.18-rc2~98
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7f0852f959d8e92786c684ebd7fee3332a2f4efe;p=linux-2.6-omap-h63xx.git

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.
---

7f0852f959d8e92786c684ebd7fee3332a2f4efe