diff --git a/[refs] b/[refs] index 70f5e0303e14..0ae188ab28a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61cdb01853c99e78d8b54db1b77e524c0dce585d +refs/heads/master: 08eaa1e0ce5bad11bedd311a9ddc3baf778ee1df diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 568ea9373091..ed5b5f5ac175 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5067,6 +5067,7 @@ F: net/nfc/ F: include/linux/nfc.h F: include/net/nfc/ F: drivers/nfc/ +F: include/linux/platform_data/pn544.h NFS, SUNRPC, AND LOCKD CLIENTS M: Trond Myklebust