Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6
commita0cd30fd26a398c0c6e50c6760610d4529f17a84
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 22 Jun 2005 17:41:59 +0000 (22 10:41 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 22 Jun 2005 17:41:59 +0000 (22 10:41 -0700)
tree00c02a25966468706adf9a1d035c08f71baa6078
parent94eb7f4cefaf3ed8e97504ce4f3946bdb908e501
parente5c515b4532f4aac2b1136612d8c3ecd1891f431
Merge /pub/scm/linux/kernel/git/gregkh/w1-2.6