summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstoreLinus Torvalds2012-10-079-40/+139
|\
| * pstore: Avoid recursive spinlocks in the oops_in_progress caseChuansheng Liu2012-09-201-1/+7
| * pstore/ftrace: Convert to its own enable/disable debugfs knobAnton Vorontsov2012-09-067-26/+105
| * pstore/ram: Add missing platform_device_unregisterJovi Zhang2012-08-311-0/+1
| * MAINTAINERS: Add pstore maintainersAnton Vorontsov2012-08-061-0/+12
| * pstore/ram: Mark ramoops_pstore_write_buf() as notraceAnton Vorontsov2012-08-041-6/+6
| * pstore/ram: Fix printk format warningRandy Dunlap2012-08-041-1/+1
| * pstore/ram: Fix possible NULL dereferenceAnton Vorontsov2012-08-041-6/+7
* | Merge tag 'for-v3.7' of git://git.infradead.org/battery-2.6Linus Torvalds2012-10-0726-297/+3519
|\ \
| * \ Merge with upstream to accommodate with MFD changesAnton Vorontsov2012-09-2456-236/+287
| |\ \
| * | | pda_power: Remove ac_draw_failed goto and labelPaul Parsons2012-09-211-3/+0
| * | | charger-manager: Add support sysfs entry for chargerChanwoo Choi2012-09-212-0/+191
| * | | charger-manager: Support limit of maximum possibleChanwoo Choi2012-09-202-1/+94
| * | | charger-manager: Check fully charged state of battery periodicallyChanwoo Choi2012-09-202-46/+123
| * | | lp8727_charger: More pure cosmetic improvementsKim, Milo2012-09-202-5/+6
| * | | lp8727_charger: Fix checkpatch warningKim, Milo2012-09-201-2/+1
| * | | lp8727_charger: Add description in the private dataKim, Milo2012-09-201-4/+8
| * | | lp8727_charger: Fix a typo - chg_parm to chg_paramKim, Milo2012-09-201-8/+8
| * | | lp8727_charger: Make some cosmetic changes in lp8727_delayed_func()Kim, Milo2012-09-201-3/+5
| * | | lp8727_charger: Clean up lp8727_charger_changed()Kim, Milo2012-09-201-9/+13
| * | | lp8727_charger: Return if the battery is dischargingKim, Milo2012-09-201-6/+7
| * | | lp8727_charger: Make lp8727_charger_get_propery() simplerKim, Milo2012-09-201-3/+4
| * | | lp8727_charger: Make lp8727_ctrl_switch() inlineKim, Milo2012-09-201-1/+1
| * | | lp8727_charger: Make lp8727_init_device() shorterKim, Milo2012-09-201-5/+1
| * | | lp8727_charger: Clean up lp8727_is_charger_attached()Kim, Milo2012-09-201-8/+6
| * | | lp8727_charger: Use specific definitionKim, Milo2012-09-201-3/+6
| * | | lp8727_charger: Clean up lp8727 definitionsKim, Milo2012-09-202-83/+81
| * | | lp8727_charger: Use the definition rather than enumKim, Milo2012-09-201-11/+5
| * | | lp8727_charger: Fix code for getting battery tempKim, Milo2012-09-201-5/+26
| * | | lp8727_charger: Clear interrrupts at inital timeKim, Milo2012-09-201-0/+8
| * | | lp8727_charger: Clean up the interrupt handlerKim, Milo2012-09-201-9/+28
| * | | lp8727_charger: Remove unnecessary workqueue threadKim, Milo2012-09-201-12/+1
| * | | lp8727_charger: Add configurable debouce timerKim, Milo2012-09-202-3/+11
| * | | lp8727_charger: Fix buggy code of NULL pdataKim, Milo2012-09-202-10/+25
| * | | lp8727_charger: Cleanup _probe() and _remove()Kim, Milo2012-09-201-11/+9
| * | | lp8727_charger: Use devm_kzalloc()Kim, Milo2012-09-201-6/+2
| * | | twl4030_charger: Use IRQF_ONESHOTFengguang Wu2012-09-201-2/+3
| * | | lp8727_charger: Use IRQF_ONESHOTFengguang Wu2012-09-201-1/+1
| * | | 88pm860x_battery and charger: Fix a few post-merge issuesAnton Vorontsov2012-09-203-4/+4
| * | | power_supply: Enable battery-charger for 88pm860xJett.Zhou2012-09-206-2/+1905
| * | | power_supply: Add new lp8788 charger driverKim, Milo2012-09-203-0/+803
| * | | da9052-battery: Don't free IRQ that wasn't requestedDan Carpenter2012-09-201-1/+1
| * | | sbs-battery: Probe should try talking to the deviceOlof Johansson2012-09-201-0/+10
| * | | smb347-charger: Fix battery status reporting logic for charger faultsRamakrishna Pallala2012-09-201-15/+82
| * | | pda_power: Fix ac_draw usage before it being setPaul Parsons2012-09-201-7/+9
| * | | power_supply: Add new power supply properties CHARGE_CURRENT/VOLTAGE_MAXRamakrishna Pallala2012-08-223-0/+10
| * | | charger-manager: Fix struct charger_desc's misleading commentAnton Vorontsov2012-08-221-1/+1
| * | | charger-manager: Use replacement variable to check state of batteryChanwoo Choi2012-08-222-4/+1
| * | | charger-manager: Disable regulator when charger cable is detachedChanwoo Choi2012-08-221-2/+17
| * | | da9030_battery: Don't use 0 as NULLAnton Vorontsov2012-08-221-2/+2