summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nfs-for-3.3' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2012-01-1029-271/+525
|\
| * NFSv4: Change the default setting of the nfs4_disable_idmapping parameterTrond Myklebust2012-01-092-7/+12
| * NFSv4: Save the owner/group name string when doing openTrond Myklebust2012-01-076-64/+162
| * NFS: Remove pNFS bloat from the generic write pathTrond Myklebust2012-01-063-27/+32
| * pnfs-obj: Must return layout on IO errorBoaz Harrosh2012-01-063-1/+15
| * pnfs-obj: pNFS errors are communicated on iodata->pnfs_errorBoaz Harrosh2012-01-061-0/+4
| * NFS: Cache state owners after files are closedChuck Lever2012-01-054-9/+92
| * NFS: Clean up nfs4_find_state_owners_locked()Chuck Lever2012-01-051-12/+3
| * NFSv4: include bitmap in nfsv4 get acl dataAndy Adamson2012-01-055-48/+89
| * nfs: fix a minor do_div portability issueChris Metcalf2012-01-051-4/+5
| * NFSv4.1: cleanup comment and debug printkAndy Adamson2012-01-051-5/+2
| * NFSv4.1: change nfs4_free_slot parameters for dynamic slotsAndy Adamson2012-01-051-3/+2
| * NFSv4.1: cleanup init and reset of session slot tablesAndy Adamson2012-01-051-37/+22
| * NFSv4.1: fix backchannel slotid off-by-one bugAndy Adamson2012-01-051-1/+1
| * nfs: fix regression in handling of context= option in NFSv4Jeff Layton2012-01-051-24/+19
| * NFS - fix recent breakage to NFS error handling.NeilBrown2012-01-051-2/+2
| * NFS: Retry mounting NFSROOTChuck Lever2012-01-051-4/+31
| * SUNRPC: Clean up the RPCSEC_GSS service ticket requestsTrond Myklebust2012-01-056-23/+32
* | Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6Linus Torvalds2012-01-106-16/+19
|\ \
| * | UBI: fix use-after-free on error pathArtem Bityutskiy2012-01-051-3/+4
| * | UBI: fix missing scrub when there is a bit-flipBhavesh Parekh2011-11-303-3/+10
| * | UBIFS: Use kmemdup rather than duplicating its implementationThomas Meyer2011-11-223-10/+5
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tei...Linus Torvalds2012-01-1017-272/+943
|\ \ \
| * | | dlm: add recovery callbacksDavid Teigland2012-01-0411-172/+333
| * | | dlm: add node slots and generationDavid Teigland2012-01-047-29/+480
| * | | dlm: move recovery barrier callsDavid Teigland2012-01-044-27/+28
| * | | dlm: convert rsb list to rb_treeBob Peterson2011-11-185-55/+113
* | | | Merge tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6Linus Torvalds2012-01-10114-1780/+2749
|\ \ \ \
| * | | | mtd: Fix dependency for MTD_DOC200xFabio Estevam2012-01-091-0/+3
| * | | | mtd: do not use mtd->block_markbad directlyArtem Bityutskiy2012-01-096-10/+6
| * | | | logfs: do not use 'mtd->block_isbad' directlyArtem Bityutskiy2012-01-091-2/+2
| * | | | mtd: introduce mtd_can_have_bb helperArtem Bityutskiy2012-01-0912-20/+21
| * | | | mtd: do not use mtd->suspend and mtd->resume directlyArtem Bityutskiy2012-01-094-11/+9
| * | | | mtd: do not use mtd->lock, unlock and is_locked directlyArtem Bityutskiy2012-01-095-29/+19
| * | | | mtd: do not use mtd->sync directlyArtem Bityutskiy2012-01-099-21/+11
| * | | | mtd: harmonize mtd_writev usageArtem Bityutskiy2012-01-094-23/+27
| * | | | mtd: do not use mtd->lock_user_prot_reg directlyArtem Bityutskiy2012-01-092-2/+2
| * | | | mtd: mtd->write_user_prot_reg directlyArtem Bityutskiy2012-01-092-4/+2
| * | | | mtd: do not use mtd->read_*_prot_reg directlyArtem Bityutskiy2012-01-092-8/+14
| * | | | mtd: do not use mtd->get_*_prot_info directlyArtem Bityutskiy2012-01-092-5/+7
| * | | | mtd: do not use mtd->read_oob directlyArtem Bityutskiy2012-01-092-7/+6
| * | | | mtd: mtdoops: do not use mtd->panic_write directlyArtem Bityutskiy2012-01-092-9/+10
| * | | | romfs: do not use mtd->get_unmapped_area directlyArtem Bityutskiy2012-01-091-15/+13
| * | | | mtd: do not use mtd->get_unmapped_area directlyArtem Bityutskiy2012-01-093-20/+14
| * | | | mtd: do use mtd->point directlyArtem Bityutskiy2012-01-094-16/+15
| * | | | mtd: introduce mtd_has_oob helperArtem Bityutskiy2012-01-093-3/+8
| * | | | mtd: mtdcore: export symbols cleanupArtem Bityutskiy2012-01-091-15/+9
| * | | | mtd: clean-up the default_mtd_writev functionArtem Bityutskiy2012-01-092-19/+24
| * | | | jffs: remove custom mtd_fake_writev functionArtem Bityutskiy2012-01-091-26/+1
| * | | | mtd: remove unused default_mtd_readv prototypeArtem Bityutskiy2012-01-091-3/+0
OpenPOWER on IntegriCloud