diff --git a/[refs] b/[refs]
index 66cd73cbc5ea..c19c2a842fe0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27c6aec214264992603526d47da9dabddf3521b3
+refs/heads/master: 839a1f79ed0ce026e6d1106f202eaaae929b4200
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 2dcfca850639..bc8905dc2252 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -2876,6 +2876,13 @@ F:	Documentation/power/freezing-of-tasks.txt
 F:	include/linux/freezer.h
 F:	kernel/freezer.c
 
+FRONTSWAP API
+M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+L:	linux-kernel@vger.kernel.org
+S:	Maintained
+F:	mm/frontswap.c
+F:	include/linux/frontswap.h
+
 FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS
 M:	David Howells <dhowells@redhat.com>
 L:	linux-cachefs@redhat.com