diff --git a/[refs] b/[refs] index 9c246d8248eb..224e8160b590 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5ba50bc3b9311256ae6a6620e7708fb25d1f6e2 +refs/heads/master: 8cd725a1de1df8e5a2d694abc1e6b6aad5ce7d06 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index bb76fc42fc42..3766f6a273e2 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5290,7 +5290,7 @@ M: David Woodhouse T: git git://git.infradead.org/battery-2.6.git S: Maintained F: include/linux/power_supply.h -F: drivers/power/power_supply* +F: drivers/power/ PNP SUPPORT M: Adam Belay