diff --git a/[refs] b/[refs] index 0f28b5c884f0..cf1d8149f3b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3df0b7533ccad7bb3ef25383fea9c990b0033a2 +refs/heads/master: 895d9f0f15ff6b2d20bfbdc2b8205d1791437294 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 6360b9b9bbbd..587bc8bd6f73 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3034,8 +3034,9 @@ S: Maintained MULTIFUNCTION DEVICES (MFD) P: Samuel Ortiz -M: sameo@openedhand.com +M: sameo@linux.intel.com L: linux-kernel@vger.kernel.org +T: git kernel.org:/pub/scm/linux/kernel/git/sameo/mfd-2.6.git S: Supported MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM