summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6Linus Torvalds2012-03-3029-681/+916
|\
| * mtd: unify initialization of erase_info->fail_addrShmulik Ladkani2012-03-271-1/+0
| * jffs2: Standardize JFFS_<LEVEL> usesJoe Perches2012-03-273-34/+13
| * jffs2: Use pr_fmt and remove jffs: from formatsJoe Perches2012-03-2723-38/+80
| * jffs2: Convert printks to pr_<level>Joe Perches2012-03-2717-264/+342
| * jffs2: Convert most D1/D2 macros to jffs2_dbgJoe Perches2012-03-2716-360/+504
| * jffs2: make jffs2_initxattrs() staticNikola Pajkovsky2012-03-271-2/+2
| * jffs2: Fix typo in compr.cMasanari Iida2012-03-271-1/+1
| * jffs2: Remove unnecessary OOM messagesJoe Perches2012-03-272-5/+2
| * jffs2: fix typo in scan.cMasanari Iida2012-03-271-1/+1
| * jffs2: update to new MTD interfaceBrian Norris2012-03-271-3/+1
| * romfs: switch to new MTD APIArtem Bityutskiy2012-03-271-1/+1
| * jffs2: remove direct mtd->point referenceArtem Bityutskiy2012-03-271-11/+9
* | Merge git://git.samba.org/sfrench/cifs-2.6Linus Torvalds2012-03-3012-946/+1381
|\ \
| * | [CIFS] Update CIFS version number to 1.77Steve French2012-03-271-1/+1
| * | CIFS: Add missed forcemand mount optionPavel Shilovsky2012-03-271-2/+5
| * | Merge branch 'for-3.4'Steve French2012-03-2611-944/+1376
| |\ \
| | * | [CIFS] Fix trivial sparse warning with asyn i/o patchSteve French2012-03-231-1/+1
| | * | cifs: handle "sloppy" option appropriatelyJeff Layton2012-03-231-3/+18
| | * | cifs: use standard token parser for mount optionsSachin Prabhu2012-03-231-524/+814
| | * | cifs: remove /proc/fs/cifs/OplockEnabledJeff Layton2012-03-231-43/+0
| | * | cifs: convert cifs_iovec_write to use async writesJeff Layton2012-03-233-86/+143
| | * | cifs: call cifs_update_eof with i_lock heldJeff Layton2012-03-233-2/+11
| | * | cifs: abstract out function to marshal up the iovec array for async writesJeff Layton2012-03-233-10/+31
| | * | cifs: fix up get_numpagesJeff Layton2012-03-231-3/+1
| | * | cifs: make cifsFileInfo_get return the cifsFileInfo pointerJeff Layton2012-03-231-1/+3
| | * | cifs: fix allocation in cifs_write_allocate_pagesJeff Layton2012-03-231-7/+6
| | * | cifs: allow caller to specify completion op when allocating writedataJeff Layton2012-03-233-5/+8
| | * | cifs: add pid field to cifs_writedataJeff Layton2012-03-233-2/+4
| | * | cifs: add new cifsiod_wq workqueueJeff Layton2012-03-235-8/+20
| | * | CIFS: Change mid_q_entry structure fieldsPavel Shilovsky2012-03-236-59/+59
| | * | CIFS: Expand CurrentMid fieldPavel Shilovsky2012-03-233-40/+48
| | * | CIFS: Separate protocol-specific code from cifs_readv_receive codePavel Shilovsky2012-03-235-34/+53
| | * | CIFS: Separate protocol-specific code from demultiplex codePavel Shilovsky2012-03-237-47/+56
| | * | CIFS: Separate protocol-specific code from transport routinesPavel Shilovsky2012-03-236-88/+119
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2012-03-3041-2225/+4362
|\ \ \ \
| * | | | Btrfs: update the checks for mixed block groups with big metadata blocksChris Mason2012-03-291-12/+17
| * | | | Btrfs: update to the right index of defragmentLiu Bo2012-03-291-0/+3
| * | | | Btrfs: do not bother to defrag an extent if it is a big real extentLiu Bo2012-03-291-6/+3
| * | | | Btrfs: add a check to decide if we should defrag the rangeLiu Bo2012-03-291-1/+35
| * | | | Btrfs: fix recursive defragment with autodefrag optionLiu Bo2012-03-291-3/+5
| * | | | Btrfs: fix the mismatch of page->mappingLiu Bo2012-03-291-16/+19
| * | | | Btrfs: fix race between direct io and autodefragLiu Bo2012-03-291-1/+5
| * | | | Btrfs: fix deadlock during allocating chunksLiu Bo2012-03-291-0/+50
| * | | | Btrfs: show useful info in space reservation tracepointLiu Bo2012-03-293-25/+13
| * | | | Btrfs: don't use crc items bigger than 4KBChris Mason2012-03-281-1/+3
| * | | | Btrfs: flush out and clean up any block device pages during mountChris Mason2012-03-282-0/+4
| * | | | Merge git://git.jan-o-sch.net/btrfs-unstable into for-linusChris Mason2012-03-285-55/+75
| |\ \ \ \
| | * | | | Btrfs: fix regression in scrub path resolvingJan Schmidt2012-03-274-55/+73
| | * | | | Btrfs: check return value of btrfs_cow_block()Jan Schmidt2012-03-271-2/+4
OpenPOWER on IntegriCloud