| commit | c2fdea01ab0d4d19fac3de689c3c8901e53496e0 | |
| author | Jaime Velasco Juan <jsagarribay@gmail.com> | |
| Sat, 29 Dec 2007 10:24:00 +0000 (29 10:24 +0000) | ||
| committer | Jaime Velasco Juan <jsagarribay@gmail.com> | |
| Sat, 29 Dec 2007 10:24:00 +0000 (29 10:24 +0000) | ||
| tree | b773c1cb0ee6cb087332ea7c2921e65bb60f8645 | treesnapshot (tar.gz zip) |
| parent | 19db3f53812fba5240377d9da185c2b1651372d4 | commitdiff |
| parent | 1740edbbef8d68b241e0db86431c91a5f86c7c50 | commitdiff |
Merge branch 'kernel-cleanup'
Conflicts:
stk-sensor.c
Conflicts:
stk-sensor.c