Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / include / linux / w1-gpio.h
2009-06-18 Daniel Mackw1-gpio: add external pull-up enable callback
2008-02-06 Ville Syrjalaw1-gpio: add GPIO w1 bus master driver