Merge git://git.infradead.org/battery-2.6
[safe/jmp/linux-2.6] / include / linux / w1-gpio.h
2008-02-06 Ville Syrjalaw1-gpio: add GPIO w1 bus master driver