diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-03 16:28:50 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-03 16:28:50 +0200 |
| commit | 3ff32a0def6e0d2e21a6c5ad1b00726592774018 (patch) | |
| tree | af683b2cb62f7e5ee18cb109d15dcfd43769b984 /fs/ext3/file.c | |
| parent | Merge branches 'cleanup', 'fixes', 'misc', 'omap-barrier' and 'uaccess' into ... (diff) | |
| parent | Merge branch 'psci/for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-3ff32a0def6e0d2e21a6c5ad1b00726592774018.tar.xz linux-3ff32a0def6e0d2e21a6c5ad1b00726592774018.zip | |
Merge branch 'devel-stable' into for-linus
Conflicts:
drivers/perf/arm_pmu.c
Diffstat (limited to 'fs/ext3/file.c')
0 files changed, 0 insertions, 0 deletions