summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'for-v3.5' of git://git.infradead.org/battery-2.6Linus Torvalds2012-05-3117-497/+943
|\
| * smb347-charger: Include missing <linux/err.h>Mika Westerberg2012-05-181-0/+1
| * smb347-charger: Clean up battery attributesRamakrishna Pallala2012-05-061-49/+0
| * max17042_battery: Add support for max17047/50 chipRamakrishna Pallala2012-05-053-13/+78
| * sbs-battery.c: Capacity attr = remaining relative capacityNikolaus Voss2012-05-051-1/+1
| * isp1704_charger: Use after free on probe errorDan Carpenter2012-05-051-1/+1
| * ds2781_battery: Use DS2781_PARAM_EEPROM_SIZE and DS2781_USER_EEPROM_SIZEAxel Lin2012-05-051-14/+6
| * power_supply: Fix a typo in BATTERY_DS2781 Kconfig entryAxel Lin2012-05-051-1/+1
| * charger-manager: Provide cm_notify_event function for in-kernel useChanwoo Choi2012-05-053-9/+195
| * charger-manager: Poll battery health in normal stateChanwoo Choi2012-05-053-1/+278
| * smb347-charger: Convert to regmap APIMika Westerberg2012-05-052-327/+232
| * smb347-charger: Move IRQ enabling to the end of probeMika Westerberg2012-05-051-4/+2
| * smb347-charger: Rename few functions to match better what they are doingMika Westerberg2012-05-051-21/+21
| * smb347-charger: Convert to use module_i2c_driver()Mika Westerberg2012-05-051-11/+1
| * smb347_charger: Cleanup power supply registration code in probeRamakrishna Pallala2012-05-051-30/+40
| * ab8500: Clean up probe routinesLee Jones2012-05-053-18/+30
| * ab8500_fg: Harden platform data checkLinus Walleij2012-05-051-2/+2
| * ab8500_btemp: Harden platform data checkLinus Walleij2012-05-051-2/+2
| * ab8500_charger: Harden platform data checkLinus Walleij2012-05-051-3/+2
| * MAINTAINERS: Fix 'F' entry for the power supply classAnton Vorontsov2012-05-051-1/+1
| * max17042_battery: Handle irq request failure caseRamakrishna Pallala2012-05-051-1/+3
| * max17042_battery: Fix power supply and irq registration orderingRamakrishna Pallala2012-05-041-5/+7
| * power_supply: Make the core a boolean instead of a tristateAnton Vorontsov2012-05-042-2/+2
| * power_supply: Add voltage_ocv property and use it for max17042 driverRamakrishna Pallala2012-05-044-0/+13
| * max17042_battery: Move dev_pm_ops struct under CONFIG_PMAnton Vorontsov2012-05-041-9/+11
| * max17042_battery: Add suspend/resume hooksRamakrishna Pallala2012-05-041-0/+41
| * max17042_battery: Fix driver exit functionRamakrishna Pallala2012-05-041-0/+2
| * max17042_battery: Fix a couple buffer overflowsDan Carpenter2012-05-041-6/+4
* | Merge git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds2012-05-312-2/+2
|\ \
| * | KVM: Export asm-generic/kvm_para.hAvi Kivity2012-05-291-0/+1
| * | KVM: MMU: fix huge page adapted on non-PAE hostXiao Guangrong2012-05-281-2/+1
* | | Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsiLinus Torvalds2012-05-3156-674/+12125
|\ \ \
| * | | [SCSI] fix scsi_wait_scanJames Bottomley2012-05-301-1/+1
| * | | [SCSI] fix async probe regressionDan Williams2012-05-301-2/+5
| * | | [SCSI] be2iscsi: fix dma free size mismatch regressionMike Christie2012-05-301-3/+2
| * | | [SCSI] qla4xxx: Update driver version to 5.02.00-k17Vikas Chaudhary2012-05-301-1/+1
| * | | [SCSI] qla4xxx: Capture minidump for ISP82XX on firmware failureTej Parkash2012-05-309-16/+1293
| * | | [SCSI] qla4xxx: Add change_queue_depth API supportTej Parkash2012-05-301-0/+20
| * | | [SCSI] qla4xxx: Fix clear ddb mbx command failure issue.Manish Rangankar2012-05-301-1/+35
| * | | [SCSI] qla4xxx: Fix kernel panic during discovery logout.Manish Rangankar2012-05-301-1/+2
| * | | [SCSI] qla4xxx: Correct early completion of pending mbox.Lalit Chandivade2012-05-301-19/+19
| * | | [SCSI] fcoe, bnx2fc, libfcoe: SW FCoE and bnx2fc use FCoE SyfsRobert Love2012-05-234-25/+285
| * | | [SCSI] libfcoe: Add fcoe_sysfsRobert Love2012-05-236-3/+1046
| * | | [SCSI] bnx2fc: Allocate fcoe_ctlr with bnx2fc_interface, not as a memberRobert Love2012-05-234-63/+101
| * | | [SCSI] fcoe: Allocate fcoe_ctlr with fcoe_interface, not as a memberRobert Love2012-05-233-52/+102
| * | | [SCSI] Fix dm-multipath starvation when scsi host is busyJun'ichi Nomura2012-05-231-4/+7
| * | | [SCSI] ufs: fix potential NULL pointer dereferencing error in ufshcd_prove.Namjae Jeon2012-05-231-2/+3
| * | | [SCSI] qla2xxx: don't free pool that wasn't allocatedDan Carpenter2012-05-221-1/+1
| * | | [SCSI] mptfusion: unlock on error in mpt_config()Dan Carpenter2012-05-221-0/+1
| * | | [SCSI] tcm_qla2xxx: Add >= 24xx series fabric module for target-coreNicholas Bellinger2012-05-224-0/+2047