Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / drivers / pps / sysfs.c
2009-06-18 Rodolfo GiomettiLinuxPPS: core support