Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 22:55:53 +0000 (15:55 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 22:55:53 +0000 (15:55 -0700)
commit6d8de3a26b5c20b04a9317b4446582167d5883da
treeaa71ab52059380fa2bbdcee4a0cf559a9dacdf01
parent7bbedd521310547ca73cc77adcf61fb85723adc3
parent0a25e4d5647003a32ba5496f9d0f40ba9c1e3863
Merge /pub/scm/linux/kernel/git/gregkh/w1-2.6