diff --git a/[refs] b/[refs] index 23346dd26112..cae9a372a9ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05e2408d4324ae132eda6530cce0aa24e79f0c41 +refs/heads/master: d7a75e190971209b18fbdb06232c25c7b44c31c5 diff --git a/trunk/drivers/staging/memrar/TODO b/trunk/drivers/staging/memrar/TODO index 0087447d5034..435e09ba44c5 100644 --- a/trunk/drivers/staging/memrar/TODO +++ b/trunk/drivers/staging/memrar/TODO @@ -1,7 +1,7 @@ RAR Handler (memrar) Driver TODO Items ====================================== -Maintainer: Ossama Othman +Maintainer: Eugene Epshteyn memrar.h -------- diff --git a/trunk/drivers/staging/memrar/memrar-abi b/trunk/drivers/staging/memrar/memrar-abi index 98a6bb158baf..c23fc996a435 100644 --- a/trunk/drivers/staging/memrar/memrar-abi +++ b/trunk/drivers/staging/memrar/memrar-abi @@ -1,7 +1,7 @@ What: /dev/memrar Date: March 2010 -KernelVersion: Kernel version this feature first showed up in. -Contact: Ossama Othman +KernelVersion: 2.6.34 +Contact: Eugene Epshteyn Description: The Intel Moorestown Restricted Access Region (RAR) Handler driver exposes an ioctl() based interface that allows a user to reserve and release blocks of RAR