diff --git a/[refs] b/[refs] index 4f8c59a4bcb5..c4a0063a7cad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 494bbdd8b11f08dc703a76513674d57c5c349fa7 +refs/heads/master: 1b46f2a239bfa3452179c8f1783f41ad1ff1833c diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 667216539467..199bb4b836cd 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -7915,6 +7915,12 @@ T: git git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git S: Maintained F: drivers/platform/x86/thinkpad_acpi.c +TI BANDGAP AND THERMAL DRIVER +M: Eduardo Valentin +L: linux-pm@vger.kernel.org +S: Maintained +F: drivers/staging/omap-thermal/ + TI FLASH MEDIA INTERFACE DRIVER M: Alex Dubov S: Maintained