From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 8 Sep 2005 22:55:53 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6d8de3a26b5c20b04a9317b4446582167d5883da;p=openwrt%2Fstaging%2Fblogic.git

Merge /pub/scm/linux/kernel/git/gregkh/w1-2.6
---

6d8de3a26b5c20b04a9317b4446582167d5883da