Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[linux-2.6] / drivers / w1 / slaves / Makefile
2006-03-24  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-03-24  Evgeniy Polyakov[PATCH] W1: Move w1 bus master code into 'w1/masters...