summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-07-317-16/+84
|\
| * tun: Fix formatting.David S. Miller2012-07-301-2/+2
| * net/tun: fix ioctl() based info leaksMathias Krause2012-07-291-1/+3
| * tg3: Update version to 3.124Michael Chan2012-07-291-1/+1
| * tg3: Fix race condition in tg3_get_stats64()Michael Chan2012-07-291-2/+4
| * tg3: Add New 5719 Read DMA workaroundMichael Chan2012-07-292-1/+29
| * tg3: Fix Read DMA workaround for 5719 A0.Michael Chan2012-07-291-2/+1
| * tg3: Request APE_LOCK_PHY before PHY accessMichael Chan2012-07-292-0/+38
| * mISDN: Bugfix only few bytes are transfered on a connectionKarsten Keil2012-07-291-3/+4
| * seeq: use PTR_RET at init_module of driverDevendra Naga2012-07-291-3/+1
| * bnx2x: remove cast around the kmalloc in bnx2x_prev_mark_pathDevendra Naga2012-07-291-2/+1
| * qlge: Add offload features to vlan interfacesbrenohl@br.ibm.com2012-07-291-0/+1
* | Merge tag 'for-v3.6' of git://git.infradead.org/battery-2.6Linus Torvalds2012-07-3117-55/+697
|\ \
| * | thermal: Constify 'type' argument for the registration routineAnton Vorontsov2012-07-311-1/+1
| * | Merge with upstream to accommodate with thermal changesAnton Vorontsov2012-07-31429-2372/+3770
| |\ \
| * | | olpc-battery: update CHARGE_FULL_DESIGN property for BYD LiFe batteriesRichard A. Smith2012-07-161-4/+2
| * | | olpc-battery: Add VOLTAGE_MAX_DESIGN propertyRichard A. Smith2012-07-161-0/+56
| * | | charger-manager: Fix build break related to EXTCONChanwoo Choi2012-07-151-0/+1
| * | | lp8727_charger: Move header file into platform_data directoryKim, Milo2012-07-141-1/+1
| * | | power_supply: Add min/max alert properties for CAPACITY, TEMP, TEMP_AMBIENTRamakrishna Pallala2012-07-131-0/+6
| * | | bq27x00_battery: Add support for BQ27425 chipSaranya Gopal2012-07-131-15/+69
| * | | charger-manager: Set current limit of regulator for over current protectionChanwoo Choi2012-07-131-0/+15
| * | | charger-manager: Use EXTCON Subsystem to detect charger cables for chargingChanwoo Choi2012-07-131-16/+121
| * | | test_power: Add VOLTAGE_NOW and BATTERY_TEMP propertiesDmitry Eremin-Solenikov2012-06-201-0/+31
| * | | test_power: Add support for USB AC sourceDmitry Eremin-Solenikov2012-06-201-2/+46
| * | | gpio-charger: Use cansleep version of gpio_set_valuePritesh Raithatha2012-06-191-1/+1
| * | | bq27x00_battery: Add support for power average and health propertiesSyed Rafiuddin2012-06-191-0/+71
| * | | sbs-battery: Don't trigger false supply_changed eventNikolaus Voss2012-06-191-1/+1
| * | | twl4030_charger: Allow charger to control the regulator that feeds itNeilBrown2012-06-192-4/+20
| * | | twl4030_charger: Add backup-battery chargingNeilBrown2012-06-191-0/+59
| * | | twl4030_charger: Fix some typosNeilBrown2012-06-191-3/+3
| * | | max17042_battery: Support CHARGE_COUNTER power supply attributeRamakrishna Pallala2012-06-191-0/+8
| * | | smb347-charger: Add constant charge and current propertiesRamakrishna Pallala2012-06-191-6/+117
| * | | power_supply: Add constant charge_current and charge_voltage propertiesRamakrishna Pallala2012-06-191-0/+2
| * | | power_supply: Register battery as a thermal zoneJenny TC2012-06-171-0/+65
| * | | ds2781_battery: w1_ds2781_read() should be staticAnton Vorontsov2012-06-171-1/+1
| * | | pda_power: Complain if regulator operations failMark Brown2012-06-171-2/+2
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2012-07-312-355/+462
|\ \ \ \
| * | | | rbd: create rbd_refresh_helper()Alex Elder2012-07-301-10/+15
| * | | | rbd: return obj version in __rbd_refresh_header()Alex Elder2012-07-301-14/+11
| * | | | rbd: fixes in rbd_header_from_disk()Alex Elder2012-07-301-5/+13
| * | | | rbd: always pass ops array to rbd_req_sync_op()Alex Elder2012-07-301-30/+16
| * | | | rbd: pass null version pointer in add_snap()Alex Elder2012-07-301-2/+1
| * | | | rbd: make rbd_create_rw_ops() return a pointerAlex Elder2012-07-301-31/+39
| * | | | rbd: have __rbd_add_snap_dev() return a pointerAlex Elder2012-07-301-15/+22
| * | | | rbd: drop "object_name" from rbd_req_sync_unwatch()Alex Elder2012-07-301-4/+5
| * | | | rbd: drop "object_name" from rbd_req_sync_notify_ack()Alex Elder2012-07-301-4/+3
| * | | | rbd: drop "object_name" from rbd_req_sync_notify()Alex Elder2012-07-301-4/+4
| * | | | rbd: drop "object_name" from rbd_req_sync_watch()Alex Elder2012-07-301-7/+5
| * | | | rbd: drop rbd_dev parameter in snap functionsAlex Elder2012-07-301-12/+7