diff --git a/[refs] b/[refs] index 9223fbc484ce..92da8ba32d55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c52827cc4ddf387c59b605c9d83dcaffbbf465bf +refs/heads/master: 190f998b7951bcb8aff7e1fd023f25d0adcc5045 diff --git a/trunk/drivers/staging/mei/TODO b/trunk/drivers/staging/mei/TODO index 7d9a13b0f2dd..fc266018355e 100644 --- a/trunk/drivers/staging/mei/TODO +++ b/trunk/drivers/staging/mei/TODO @@ -3,5 +3,8 @@ TODO: Upon Unstaging: - move mei.h to include/linux/mei.h - Documentation/ioctl/ioctl-number.txt + - move mei.txt under Documentation/mei/ + - move mei-amt-version.c under Documentation/mei + - add hostprogs-y for mei-amt-version.c - drop mei_version.h - Updated MAINTAINERS