summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-02-02 05:13:05 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-02-02 05:13:05 +0100
commitae9458d6a0956aa21cb49e1251e35a8d4dacbe6e (patch)
tree98c162c79113bc2bd748a3ad5b6fb5ba66139751 /MAINTAINERS
parentMerge branch 'for-linus' of git://linux-nfs.org/~bfields/linux (diff)
parentapm_power: check I.intval for zero value, we use it as the divisor (diff)
downloadlinux-ae9458d6a0956aa21cb49e1251e35a8d4dacbe6e.tar.xz
linux-ae9458d6a0956aa21cb49e1251e35a8d4dacbe6e.zip
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: apm_power: check I.intval for zero value, we use it as the divisor MAINTAINERS: remove kernel-discuss@handhelds.org list pda_power: implement polling pda_power: various cleanups apm_power: support using VOLTAGE_* properties for apm calculations pda_power: add suspend/resume support power_supply: add few more values and props pda_power: only register available psu power: fix incorrect unregistration in power_supply_create_attrs error path power: remove POWER_SUPPLY_PROP_CAPACITY_LEVEL [BATTERY] power_supply_leds: use kasprintf [BATTERY] Every file should include the headers containing the prototypes for its global functions.
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6cae13718925..58b16038baea 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3053,7 +3053,6 @@ M: cbou@mail.ru
P: David Woodhouse
M: dwmw2@infradead.org
L: linux-kernel@vger.kernel.org
-L: kernel-discuss@handhelds.org
T: git git.infradead.org/battery-2.6.git
S: Maintained