summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* locks/nfsd: allocate file lock outside of spinlockArnd Bergmann2010-10-273-35/+28
* lockd: fix nlmsvc_notify_blocked lockingJ. Bruce Fields2010-10-271-2/+4
* lockd: push lock_flocks downArnd Bergmann2010-10-274-14/+8
* Merge branch 'ima-memory-use-fixes'Linus Torvalds2010-10-267-177/+202
|\
| * IMA: fix the ToMToU logicEric Paris2010-10-261-5/+6
| * IMA: explicit IMA i_flag to remove global lock on inode_deleteEric Paris2010-10-263-5/+14
| * IMA: drop refcnt from ima_iint_cache since it isn't neededEric Paris2010-10-263-30/+19
| * IMA: only allocate iint when neededEric Paris2010-10-262-39/+65
| * IMA: move read counter into struct inodeEric Paris2010-10-266-34/+22
| * IMA: use i_writecount rather than a private counterEric Paris2010-10-263-17/+6
| * IMA: use inode->i_lock to protect read and write countersEric Paris2010-10-262-34/+24
| * IMA: convert internal flags from long to charEric Paris2010-10-261-2/+2
| * IMA: use unsigned int instead of long for countersEric Paris2010-10-263-9/+14
| * IMA: drop the inode opencount since it isn't needed for operationEric Paris2010-10-263-14/+3
| * IMA: use rbtree instead of radix tree for inode information cacheEric Paris2010-10-262-36/+75
* | Merge git://git.infradead.org/battery-2.6Linus Torvalds2010-10-2615-27/+1483
|\ \
| * | power_supply: Makefile cleanupmatt mooney2010-10-061-12/+4
| * | bq27x00_battery: Add missing kfree(di->bus) in bq27x00_battery_remove()Axel Lin2010-10-061-0/+1
| * | power_supply: Introduce maximum current propertyHeikki Krogerus2010-10-062-0/+2
| * | power_supply: Add types for USB chargersHeikki Krogerus2010-10-062-2/+6
| * | ds2782_battery: Fix unitsRyan Mallon2010-10-061-6/+6
| * | power_supply: Add driver for TWL4030/TPS65950 BCI chargerGrazvydas Ignotas2010-09-303-0/+572
| * | bq20z75: Add support for more power supply propertiesRhyland Klein2010-09-281-48/+156
| * | wm831x_power: Add missing kfree(wm831x_power) in wm831x_power_remove()Axel Lin2010-09-281-0/+1
| * | jz4740-battery: Add missing kfree(jz_battery) in jz_battery_remove()Axel Lin2010-09-281-0/+1
| * | ds2760_battery: Add missing kfree(di) in ds2760_battery_remove()Axel Lin2010-09-281-0/+1
| * | olpc_battery: Fix endian neutral breakage for s16 valuesRichard A. Smith2010-09-281-4/+4
| * | ds2760_battery: Fix W1 and W1_SLAVE_DS2760 dependencyMartin Schwidefsky2010-09-231-2/+1
| * | pcf50633-charger: Add missing sysfs_remove_group()Axel Lin2010-09-221-0/+1
| * | power_supply: Add driver for TI BQ20Z75 gas gauge ICRhyland Klein2010-09-063-0/+393
| * | wm831x_power: Remove duplicate chg maskIan Lartey2010-09-011-1/+0
| * | omap: rx51: Add support for USB chargersHeikki Krogerus2010-08-201-0/+5
| * | power_supply: Add isp1704 charger detection driverHeikki Krogerus2010-08-193-0/+377
* | | Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mc...Linus Torvalds2010-10-264-224/+313
|\ \ \
| * | | i7core_edac: return -ENODEV when devices were already probedMauro Carvalho Chehab2010-10-241-1/+1
| * | | i7core_edac: properly terminate pci_dev_tableMauro Carvalho Chehab2010-10-241-4/+5
| * | | i7core_edac: Avoid PCI refcount to reach zero on successive load/reloadMauro Carvalho Chehab2010-10-241-0/+7
| * | | i7core_edac: Fix refcount error at PCI devicesMauro Carvalho Chehab2010-10-241-35/+2
| * | | i7core_edac: it is safe to i7core_unregister_mci() when mci=NULLMauro Carvalho Chehab2010-10-241-8/+5
| * | | i7core_edac: Fix an oops at i7core probeMauro Carvalho Chehab2010-10-241-4/+4
| * | | i7core_edac: Remove unused member channels in i7core_pvtHidetoshi Seto2010-10-241-2/+0
| * | | i7core_edac: Remove unused arg csrow from get_dimm_configHidetoshi Seto2010-10-241-7/+7
| * | | i7core_edac: Reduce args of i7core_register_mciHidetoshi Seto2010-10-241-15/+9
| * | | i7core_edac: Introduce i7core_unregister_mciHidetoshi Seto2010-10-241-32/+44
| * | | i7core_edac: Use saved pointersHidetoshi Seto2010-10-241-3/+2
| * | | i7core_edac: Check probe counter in i7core_removeHidetoshi Seto2010-10-241-0/+6
| * | | i7core_edac: Call pci_dev_put() when alloc_i7core_dev() failedHidetoshi Seto2010-10-241-1/+3
| * | | i7core_edac: Fix error path of i7core_register_mciHidetoshi Seto2010-10-241-5/+11
| * | | i7core_edac: Fix order of lines in i7core_register_mciHidetoshi Seto2010-10-241-11/+9
| * | | i7core_edac: Always do get/put for all devicesHidetoshi Seto2010-10-241-13/+14