summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-3.3' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2012-01-1426-169/+624
|\
| * nfsd4: nfsd4_create_clid_dir return value is unusedJ. Bruce Fields2012-01-052-7/+5
| * NFSD: Change name of extended attribute containing junctionChuck Lever2012-01-051-3/+14
| * svcrpc: don't revert to SVC_POOL_DEFAULT on nfsd shutdownJ. Bruce Fields2012-01-051-1/+0
| * svcrpc: fix double-free on shutdown of nfsd after changing pool modeJ. Bruce Fields2012-01-051-0/+3
| * nfsd4: be forgiving in the absence of the recovery directoryJ. Bruce Fields2012-01-051-2/+3
| * nfsd4: fix spurious 4.1 post-reboot failuresJ. Bruce Fields2012-01-021-1/+8
| * NFSD: forget_delegations should use list_for_each_entry_safeBryan Schumaker2011-12-141-4/+5
| * NFSD: Only reinitilize the recall_lru list under the recall lockBryan Schumaker2011-12-131-3/+0
| * nfsd4: initialize special stateid's at compile timeJ. Bruce Fields2011-12-121-5/+12
| * NFSd: use network-namespace-aware cache registering routinesStanislav Kinsbursky2011-12-073-10/+13
| * SUNRPC: create svc_xprt in proper network namespaceStanislav Kinsbursky2011-12-064-8/+10
| * svcrpc: update outdated BKL commentJ. Bruce Fields2011-12-061-2/+2
| * nfsd41: allow non-reclaim open-by-fh's in 4.1Mi Jinlong2011-12-061-4/+3
| * svcrpc: avoid memory-corruption on pool shutdownJ. Bruce Fields2011-12-062-20/+38
| * svcrpc: destroy server sockets all at onceJ. Bruce Fields2011-12-063-8/+12
| * svcrpc: make svc_delete_xprt staticJ. Bruce Fields2011-12-062-2/+2
| * nfsd: Fix oops when parsing a 0 length exportSasha Levin2011-12-061-1/+1
| * nfsd4: Use kmemdup rather than duplicating its implementationThomas Meyer2011-11-252-4/+2
| * nfsd4: add a separate (lockowner, inode) lookupJ. Bruce Fields2011-11-152-6/+24
| * nfsd4: fix CONFIG_NFSD_FAULT_INJECTION compile errorJ. Bruce Fields2011-11-151-1/+1
| * nfsd4: share open and lock owner hash tablesJ. Bruce Fields2011-11-081-39/+32
| * nfsd4: hash lockowners to simplify RELEASE_LOCKOWNERJ. Bruce Fields2011-11-071-28/+14
| * NFSD: Remove unnecessary whitespaceBryan Schumaker2011-11-071-7/+7
| * NFSD: Call nfsd4_init_slabs() from init_nfsd()Bryan Schumaker2011-11-073-10/+9
| * NFSD: Added fault injection documentationBryan Schumaker2011-11-072-0/+71
| * NFSD: Added fault injection scriptBryan Schumaker2011-11-071-0/+49
| * NFSD: Added fault injectionBryan Schumaker2011-11-076-0/+252
| * nfsd4: maintain one seqid stream per (lockowner, file)J. Bruce Fields2011-11-071-20/+38
| * nfsd4: cleanup lock clientid handling in sessions caseJ. Bruce Fields2011-11-071-5/+9
| * nfsd4: fix lockowner matchingJ. Bruce Fields2011-11-071-2/+15
| * Update NFSD MAINTAINERNeilBrown2011-11-072-1/+5
* | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2012-01-143-15/+14
|\ \
| * | powerpc: Fix unpaired __trace_hcall_entry and __trace_hcall_exitLi Zhong2012-01-111-1/+2
| * | powerpc: Fix RCU idle and hcall tracingAnton Blanchard2012-01-112-14/+12
* | | Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-01-1441-304/+92
|\ \ \
| * | | MAINTAINERS: List i2c-omap and i2c-davinci driversJean Delvare2012-01-121-0/+3
| * | | MAINTAINERS: i2c: Add third maintainerWolfram Sang2012-01-121-0/+1
| * | | i2c/gpio-i2cmux: Convert to use module_platform_driver()Axel Lin2012-01-121-12/+1
| * | | i2c/busses: Use module_platform_driver()Axel Lin2012-01-1218-247/+24
| * | | i2c-dev: Use memdup_userThomas Meyer2012-01-121-9/+4
| * | | i2c: Convert to DEFINE_PCI_DEVICE_TABLEAxel Lin2012-01-1219-19/+19
| * | | i2c-ali1535: enable SPARC supportcorentin.labbe2012-01-121-7/+20
| * | | i2c: Fix error value returned by several bus driversJean Delvare2012-01-125-10/+20
* | | | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2012-01-1315-47/+102
|\ \ \ \
| * | | | dma-buf: Documentation update for Kconfig selectSumit Semwal2012-01-131-0/+4
| * | | | nouveau: Support Optimus models for vga_switcherooPeter Lekensteyn2012-01-133-5/+42
| * | | | nouveau: properly check for _DSM function supportPeter Lekensteyn2012-01-131-13/+22
| * | | | dma-buf: drop option text so users don't select it.Dave Airlie2012-01-131-1/+1
| * | | | radeon: Call pci_clear_master() instead of open-coding it.Michel Dänzer2012-01-132-14/+3
OpenPOWER on IntegriCloud