aboutsummaryrefslogtreecommitdiffstats
path: root/block/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-15 16:56:12 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-15 16:56:12 -0700
commit8f41958bdd577731f7411c9605cfaa9db6766809 (patch)
tree424776ff9ffe3fac011634c7c8db15dee839b0bb /block/Makefile
parentbc06cffdec85d487c77109dffcd2f285bdc502d3 (diff)
parent0909fca51346d0ece688532c54d41ebc986aef7f (diff)
downloadmrst-s0i3-test-8f41958bdd577731f7411c9605cfaa9db6766809.tar.gz
mrst-s0i3-test-8f41958bdd577731f7411c9605cfaa9db6766809.tar.xz
mrst-s0i3-test-8f41958bdd577731f7411c9605cfaa9db6766809.zip
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
Diffstat (limited to 'block/Makefile')
0 files changed, 0 insertions, 0 deletions