summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'for-v3.6' of git://git.infradead.org/battery-2.6Linus Torvalds2012-07-315-2/+82
|\
| * thermal: Constify 'type' argument for the registration routineAnton Vorontsov2012-07-311-1/+1
| * Merge with upstream to accommodate with thermal changesAnton Vorontsov2012-07-3151-92/+210
| |\
| * | lp8727_charger: Move header file into platform_data directoryKim, Milo2012-07-141-0/+0
| * | power_supply: Add min/max alert properties for CAPACITY, TEMP, TEMP_AMBIENTRamakrishna Pallala2012-07-131-0/+6
| * | charger-manager: Set current limit of regulator for over current protectionChanwoo Choi2012-07-131-0/+8
| * | charger-manager: Use EXTCON Subsystem to detect charger cables for chargingChanwoo Choi2012-07-131-1/+58
| * | twl4030_charger: Add backup-battery chargingNeilBrown2012-06-191-0/+2
| * | power_supply: Add constant charge_current and charge_voltage propertiesRamakrishna Pallala2012-06-191-0/+4
| * | power_supply: Register battery as a thermal zoneJenny TC2012-06-171-0/+3
* | | Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2012-07-314-13/+34
|\ \ \
| * | | LockD: pass actual network namespace to grace period management functionsStanislav Kinsbursky2012-07-272-4/+5
| * | | SUNRPC: service request network namespace helper introducedStanislav Kinsbursky2012-07-271-0/+2
| * | | LockD: mark host per network namespace on garbage collectStanislav Kinsbursky2012-07-271-1/+1
| * | | nfsd: add get_uint for u32'sJ. Bruce Fields2012-07-251-0/+16
| * | | sunrpc/cache.h: replace simple_strtoulEldad Zack2012-07-111-5/+1
| * | | sunrpc/cache.h: fix coding styleEldad Zack2012-07-111-4/+10
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2012-07-318-60/+113
|\ \ \ \
| * | | | libceph: clean up con flagsSage Weil2012-07-301-10/+0
| * | | | libceph: replace connection state bits with statesSage Weil2012-07-301-12/+0
| * | | | ceph: define snap counts as u32 everywhereAlex Elder2012-07-301-1/+1
| * | | | libceph: support crush tunablesSage Weil2012-07-302-1/+12
| * | | | libceph: move feature bits to separate headerSage Weil2012-07-303-20/+24
| * | | | libceph: define ceph_extract_encoded_string()Alex Elder2012-07-301-0/+47
| * | | | libceph: fix off-by-one bug in ceph_encode_filepath()Alex Elder2012-07-301-1/+1
| * | | | libceph: prevent the race of incoming work during teardownGuanjun He2012-07-301-0/+1
| * | | | libceph: fix messenger retrySage Weil2012-07-301-10/+2
| * | | | libceph: initialize msgpool message typesSage Weil2012-07-301-1/+2
| * | | | libceph: set peer name on con_open, not initSage Weil2012-07-051-2/+2
| * | | | libceph: drop declaration of ceph_con_get()Alex Elder2012-07-051-2/+0
| * | | | libceph: define and use an explicit CONNECTED stateAlex Elder2012-07-051-0/+1
| * | | | libceph: drop ceph_con_get/put helpers and nref memberSage Weil2012-06-221-1/+0
| * | | | Merge tag 'v3.5-rc1'Sage Weil2012-06-15898-14167/+32582
| |\ \ \ \
| * | | | | libceph: make ceph_con_revoke_message() a msg opAlex Elder2012-06-061-2/+2
| * | | | | libceph: make ceph_con_revoke() a msg operationAlex Elder2012-06-061-1/+2
| * | | | | libceph: have messages point to their connectionAlex Elder2012-06-061-0/+3
| * | | | | libceph: fully initialize connection in con_init()Alex Elder2012-06-061-2/+4
| * | | | | libceph: embed ceph connection structure in mon_clientAlex Elder2012-06-061-1/+1
| * | | | | libceph: start tracking connection socket stateAlex Elder2012-06-011-2/+6
| * | | | | libceph: start separating connection flags from stateAlex Elder2012-06-011-6/+12
| * | | | | libceph: embed ceph messenger structure in ceph_clientAlex Elder2012-06-012-5/+6
| * | | | | libceph: kill bad_proto ceph connection opAlex Elder2012-06-011-3/+0
| * | | | | libceph: eliminate connection state "DEAD"Alex Elder2012-06-011-1/+0
* | | | | | Merge tag 'writeback-proportions' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2012-07-302-2/+103
|\ \ \ \ \ \
| * | | | | | block: Convert BDI proportion calculations to flexible proportionsJan Kara2012-06-091-2/+2
| * | | | | | lib: Proportions with flexible periodJan Kara2012-06-091-0/+101
| | |/ / / / | |/| | | |
* | | | | | Merge tag 'nfs-for-3.6-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2012-07-307-16/+24
|\ \ \ \ \ \
| * | | | | | NFS: Split out NFS v3 inode operationsBryan Schumaker2012-07-171-6/+0
| * | | | | | NFS: Split out NFS v2 inode operationsBryan Schumaker2012-07-171-2/+0
| * | | | | | NFS: Treat NFS4ERR_CLID_INUSE as a fatal errorChuck Lever2012-07-161-2/+1