]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bc06cff 0909fca)
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)
commit8f41958bdd577731f7411c9605cfaa9db6766809
tree424776ff9ffe3fac011634c7c8db15dee839b0bbtree | snapshot
parentbc06cffdec85d487c77109dffcd2f285bdc502d3commit | diff
parent0909fca51346d0ece688532c54d41ebc986aef7fcommit | 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 2.6 source tree