700
committer Linus Torvalds <torvalds@g5.osdl.org> 1126220153 -0700

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6 
V�h��