Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[linux-2.6] / drivers / power / power_supply.h
2007-07-10  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-07-10  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-07-10  Linus TorvaldsMerge git://git.infradead.org/~dwmw2/battery-2.6
2007-07-10  Anton Vorontsov[BATTERY] Universal power supply class (was: battery...