aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi/sg.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-20 09:44:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-20 09:44:30 -0700
commit7d67474e506598fe26e0c262acf02132dc730517 (patch)
tree45ad83d853a1a461f8c86b964861336e4e913851 /drivers/scsi/sg.c
parent252883e512c6d8fbc03b6738f1620fda44c4d472 (diff)
parented8c3174dd227031d1f3b9fa4fbb512f8f623434 (diff)
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: bq27x00_battery: use unaligned access helper power_supply: fix dependency of tosa_battery power_supply: Support for Texas Instruments BQ27200 battery managers power_supply: Add function to return system-wide power state pda_power: Check and handle return value of set_irq_wake
Diffstat (limited to 'drivers/scsi/sg.c')
0 files changed, 0 insertions, 0 deletions