diff --git a/[refs] b/[refs] index 08ea2fc21a08..97bb29c3d355 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aea0d43bdec32cc4a7ba53d6c82616de3964357a +refs/heads/master: e5a85d2179d0150688c1c4343c3c1b4a71bf6588 diff --git a/trunk/drivers/staging/meilhaus/TODO b/trunk/drivers/staging/meilhaus/TODO index 6ec25203089c..d6ce39823de6 100644 --- a/trunk/drivers/staging/meilhaus/TODO +++ b/trunk/drivers/staging/meilhaus/TODO @@ -7,4 +7,4 @@ TODO: - possible comedi merge Please send cleanup patches to Greg Kroah-Hartman -and CC: David Kiliani +and CC: David Kiliani and Meilhaus Support