summaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_promise.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-16 12:55:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-16 12:55:44 -0700
commitde109c9868cf78a172ae580a83bf9a3a74a9b4bd (patch)
tree8b555db133d85b19538c0c0ac555e999c91f166e /drivers/ata/sata_promise.h
parent7fd3fce3a0a103bd6367889023c930ce3292d56a (diff)
parent1d220334d6a8a711149234dc5f98d34ae02226b8 (diff)
downloadblackbird-op-linux-de109c9868cf78a172ae580a83bf9a3a74a9b4bd.tar.gz
blackbird-op-linux-de109c9868cf78a172ae580a83bf9a3a74a9b4bd.zip
Merge git://git.infradead.org/users/cbou/battery-2.6.36
* git://git.infradead.org/users/cbou/battery-2.6.36: apm_power: Add missing break statement intel_pmic_battery: Fix battery charging status on mrst
Diffstat (limited to 'drivers/ata/sata_promise.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud