summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for_linus' into for_linus_mergedTheodore Ts'o2012-01-1016-463/+1079
|\
| * ext4: fix undefined behavior in ext4_fill_flex_info()Xi Wang2012-01-101-4/+3
| * ext4: make more symbols staticEric Sandeen2012-01-053-7/+7
| * ext4: make local symbol ext4_initxattrs staticDjalal Harouni2012-01-051-2/+3
| * jbd2: fix hung processes in jbd2_journal_lock_updates()Jan Kara2012-01-051-2/+3
| * ext4: reserve new feature flag codepointsTheodore Ts'o2012-01-051-0/+3
| * ext4: Report max_batch_time option correctlyBen Hutchings2012-01-051-1/+1
| * ext4: add missing ext4_resize_end on error pathsDjalal Harouni2012-01-041-10/+18
| * ext4: let ext4_group_add() use common codeYongqiang Yang2012-01-041-299/+10
| * ext4: let ext4_group_extend() use common codeYongqiang Yang2012-01-041-39/+2
| * ext4: add new online resize interfaceYongqiang Yang2012-01-044-0/+243
| * ext4: add a new function which adds a flex group to a fsYongqiang Yang2012-01-041-0/+82
| * ext4: add a new function which allocates bitmaps and inode tablesYongqiang Yang2012-01-041-0/+111
| * ext4: pass verify_reserved_gdb() the number of group decriptorsYongqiang Yang2012-01-041-3/+4
| * ext4: add a function which updates the super block during online resizingYongqiang Yang2012-01-041-0/+94
| * ext4: add a function which sets up a block group descriptors of a flex bgYongqiang Yang2012-01-041-0/+56
| * ext4: add a function which sets up group blocks of a flex bgYongqiang Yang2012-01-042-0/+258
| * ext4: add a structure which will be used by 64bit-resize interfaceYongqiang Yang2012-01-041-0/+55
| * ext4: add a function which adds a new group descriptors to a fsYongqiang Yang2012-01-041-0/+46
| * ext4: add a function which extends a group without checking parametersYongqiang Yang2012-01-041-0/+51
| * ext4: use proper little-endian bitopsAkinobu Mita2011-12-292-5/+6
| * ext4: remove no longer used functions in inode.cZheng Liu2011-12-292-124/+0
| * ext4: avoid counting the number of free inodes twice in find_group_orlov()Theodore Ts'o2011-12-291-3/+3
| * ext4: add missing spaces to debugging printk'sZheng Liu2011-12-292-3/+3
| * jbd2: clear revoked flag on buffers before a new transaction startedYongqiang Yang2011-12-283-0/+41
| * ext4: flush journal when switching from data=journal modeYongqiang Yang2011-12-281-2/+3
| * ext4: allocate delalloc blocks before changing journal modeYongqiang Yang2011-12-281-0/+11
| * ext4: remove unneeded file_remove_suid() from ext4_ioctl()Theodore Ts'o2011-12-211-2/+0
| * ext4: optimize ext4_find_delalloc_range() in nodelalloc modeRobin Dong2011-12-191-0/+3
| * ext4: remove unused local variableCurt Wohlgemuth2011-12-181-2/+1
| * ext4: fix error handling on inode bitmap corruptionJan Kara2011-12-181-2/+6
| * ext4: add missing space to ext4_msg output in ext4_fill_super()Zheng Liu2011-12-181-1/+1
| * ext4: do not reference pa_inode from group_paYongqiang Yang2011-12-182-4/+4
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-01-105-53/+63
|\ \
| * | vfs: new helper - d_make_root()Al Viro2012-01-102-0/+18
| * | dcache: use a dispose list in select_parentDave Chinner2012-01-101-42/+21
| * | ceph: d_alloc_root() may failAl Viro2012-01-091-4/+11
| * | ext4: fix failure exitsAl Viro2012-01-091-5/+8
| * | isofs: inode leak on mount failureAl Viro2012-01-091-2/+5
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-nextLinus Torvalds2012-01-098-347/+8
|\ \ \
| * | | sparc32: remove unused file: include/asm/pgtsun4.hSam Ravnborg2011-12-301-171/+0
| * | | sparc32: fix PAGE_SIZE definitionSam Ravnborg2011-12-292-8/+4
| * | | sparc32: enable different preemptions modelsSam Ravnborg2011-12-291-2/+0
| * | | sparc32: support atomic64_tSam Ravnborg2011-12-272-0/+3
| * | | apbuart: fix section mismatch warningSam Ravnborg2011-12-271-2/+2
| * | | sparc32: drop useless preprocessor conditional in atomic_32.hSam Ravnborg2011-12-271-4/+0
| * | | sparc32: drop unused atomic24 supportSam Ravnborg2011-12-273-161/+0
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-01-0919-32/+57
|\ \ \ \
| * | | | igmp: Avoid zero delay when receiving odd mixture of IGMP queriesBen Hutchings2012-01-091-0/+2
| * | | | netdev: make net_device_ops conststephen hemminger2012-01-092-3/+2