summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-3.5' of ../cgroup into block/for-3.5/core-mergedTejun Heo2012-04-01561-13645/+26923
|\
| * Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-03-3129-293/+2074
| |\
| | * vfs: fix out-of-date dentry_unhash() commentJ. Bruce Fields2012-03-311-1/+1
| | * vfs: split __lookup_hashMiklos Szeredi2012-03-311-64/+44
| | * untangling do_lookup() - take __lookup_hash()-calling case out of line.Al Viro2012-03-311-15/+16
| | * untangling do_lookup() - switch to calling __lookup_hash()Al Viro2012-03-311-67/+46
| | * untangling do_lookup() - merge d_alloc_and_lookup() callersAl Viro2012-03-311-3/+3
| | * untangling do_lookup() - merge failure exits in !dentry caseAl Viro2012-03-311-15/+8
| | * untangling do_lookup() - massage !dentry case towards __lookup_hash()Al Viro2012-03-311-25/+20
| | * untangling do_lookup() - get rid of need_reval in !dentry caseAl Viro2012-03-311-6/+1
| | * untangling do_lookup() - eliminate a loop.Al Viro2012-03-311-4/+8
| | * untangling do_lookup() - expand the area under ->i_mutexAl Viro2012-03-311-2/+4
| | * untangling do_lookup() - isolate !dentry stuff from the rest of it.Al Viro2012-03-311-1/+16
| | * vfs: move MAY_EXEC check from __lookup_hash()Miklos Szeredi2012-03-311-6/+5
| | * vfs: don't revalidate just looked up dentryMiklos Szeredi2012-03-311-3/+1
| | * vfs: fix d_need_lookup/d_revalidate order in do_lookupMiklos Szeredi2012-03-311-2/+2
| | * ext3: move headers to fs/ext3/Al Viro2012-03-3120-124/+1344
| | * migrate ext2_fs.h guts to fs/ext2/ext2.hAl Viro2012-03-314-10/+633
| | * get rid of pointless includes of ext2_fs.hAl Viro2012-03-312-3/+0
| | * pstore: trim pstore_get_inode()Al Viro2012-03-311-18/+8
| | * aio: take final put_ioctx() into callers of io_destroy()Al Viro2012-03-311-6/+4
| | * aio: merge aio_cancel_all() with wait_for_all_aios()Al Viro2012-03-311-15/+7
| * | 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