]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4a28ec0 63c4dff)
Merge git://git.infradead.org/battery-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 15 Jul 2007 23:56:12 +0000 (16:56 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 15 Jul 2007 23:56:12 +0000 (16:56 -0700)
commit52c8121a75c9c84e85ad842c7b301c8888d829f3
tree424776ff9ffe3fac011634c7c8db15dee839b0bbtree | snapshot
parent4a28ec06cd8522b0d7c07656f1f42fe3ad00b1dacommit | diff
parent63c4dff3880970332a67f2f812e162fafbf35430commit | diff
Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  git-battery vs git-acpi
  Power supply class and drivers: remove non obligatory return statements
  pda_power: clean up irq, timer
  MAINTAINERS: Add maintainers for power supply subsystem and drivers

Fixed up trivial conflict in drivers/w1/slaves/w1_ds2760.c manually
MAINTAINERS diff1 | diff2 | blob | history
Linux Kernel Source Tree.