summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'nfs-for-3.6-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2012-07-3140-403/+725
|\
| * nfs: explicitly reject LOCK_MAND flock() requestsJeff Layton2012-07-311-0/+9
| * nfs: increase number of permitted callback connections.NeilBrown2012-07-311-0/+4
| * SUNRPC: return negative value in case rpcbind client creation errorStanislav Kinsbursky2012-07-301-2/+2
| * NFS: Convert v4 into a moduleBryan Schumaker2012-07-3025-116/+155
| * NFS: Convert v3 into a moduleBryan Schumaker2012-07-3011-33/+25
| * NFS: Convert v2 into a moduleBryan Schumaker2012-07-3012-24/+50
| * NFS: Keep module parameters in the generic NFS clientBryan Schumaker2012-07-307-49/+48
| * NFS: Split out remaining NFS v4 inode functionsBryan Schumaker2012-07-305-48/+41
| * NFS: Pass super operations and xattr handlers in the nfs_subversionBryan Schumaker2012-07-306-25/+13
| * NFS: Only initialize the ACL client in the v3 caseBryan Schumaker2012-07-3011-69/+99
| * NFS: Create a try_mount rpc opBryan Schumaker2012-07-308-12/+16
| * NFS: Remove the NFS v4 xdev mount functionBryan Schumaker2012-07-303-58/+10
| * NFS: Add version registering frameworkBryan Schumaker2012-07-3012-61/+283
| * NFS: Fix a number of bugs in the idmapperDavid Howells2012-07-301-6/+20
| * nfs: skip commit in releasepage if we're freeing memory for fs-related reasonsJeff Layton2012-07-304-3/+19
| * sunrpc: clarify comments on rpc_make_runnableJeff Layton2012-07-301-2/+3
| * pnfsblock: bail out partial page IOPeng Tao2012-07-301-3/+36
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-07-3126-145/+316
|\ \
| * | ipv4: Properly purge netdev references on uncached routes.David S. Miller2012-07-314-4/+69
| * | ipv4: Cache routes in nexthop exception entries.David S. Miller2012-07-313-64/+79
| * | ipv4: percpu nh_rth_output cacheEric Dumazet2012-07-313-7/+34
| * | ipv4: Restore old dst_free() behavior.Eric Dumazet2012-07-317-50/+50
| * | bridge: make port attributes conststephen hemminger2012-07-301-3/+3
| * | ipv4: remove rt_cache_rebuild_countEric Dumazet2012-07-303-19/+0
| * | net: ipv4: fix RCU races on dst refcountsEric Dumazet2012-07-309-35/+55
| * | net: TCP early demux cleanupEric Dumazet2012-07-302-4/+0
| * | 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
| * | ipv6: fix incorrect route 'expires' value passed to userspaceLi Wei2012-07-292-8/+8
| * | 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
| * | ipv4: clean up put_childLin Ming2012-07-291-26/+25
| * | ipv4: fix debug info in tnode_newLin Ming2012-07-291-1/+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-3123-57/+789
|\ \ \
| * | | thermal: Constify 'type' argument for the registration routineAnton Vorontsov2012-07-312-2/+2
| * | | Merge with upstream to accommodate with thermal changesAnton Vorontsov2012-07-311031-5431/+8782
| |\ \ \
| * | | | 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-142-1/+1
| * | | | power_supply: Add min/max alert properties for CAPACITY, TEMP, TEMP_AMBIENTRamakrishna Pallala2012-07-133-0/+18
| * | | | bq27x00_battery: Add support for BQ27425 chipSaranya Gopal2012-07-131-15/+69