diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 01:56:12 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 01:56:12 +0200 |
| commit | 8f41958bdd577731f7411c9605cfaa9db6766809 (patch) | |
| tree | 424776ff9ffe3fac011634c7c8db15dee839b0bb /block/scsi_ioctl.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff) | |
| parent | git-battery vs git-acpi (diff) | |
| download | linux-8f41958bdd577731f7411c9605cfaa9db6766809.tar.xz linux-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/scsi_ioctl.c')
0 files changed, 0 insertions, 0 deletions