]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 066afce 5d77fd3)
Merge branch 'akpm-current/current'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 08:53:01 +0000 (18:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 08:53:01 +0000 (18:53 +1000)
commit4415b7b2e92cecd53cf406fb7e3b7c89103c5030
tree1ac4f7d7fe6d16a5d4a7bc2d23db113ffd43132atree | snapshot
parent066afced7b25c16d7f611816b9bf6e5f95425d10commit | diff
parent5d77fd3b294b90658bbdf17f5710f1eb06d60e7fcommit | diff
Merge branch 'akpm-current/current'

Conflicts:
Documentation/printk-formats.txt
arch/arm64/Kconfig
arch/parisc/include/asm/Kbuild
arch/s390/mm/mmap.c
drivers/rtc/class.c
drivers/rtc/rtc-mc13xxx.c
fs/ext2/file.c
fs/ext4/file.c
fs/fat/inode.c
72 files changed:
CREDITS diff1 | diff2 | blob | history
Documentation/CodingStyle diff1 | diff2 | blob | history
Documentation/filesystems/Locking diff1 | diff2 | blob | history
Documentation/kernel-parameters.txt diff1 | diff2 | blob | history
Documentation/printk-formats.txt diff1 | diff2 | blob | history
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/Kconfig diff1 | diff2 | blob | history
arch/arm/include/asm/Kbuild diff1 | diff2 | blob | history
arch/arm/include/asm/elf.h diff1 | diff2 | blob | history
arch/arm64/Kconfig diff1 | diff2 | blob | history
arch/arm64/include/asm/kvm_mmu.h diff1 | diff2 | blob | history
arch/arm64/include/asm/page.h diff1 | diff2 | blob | history
arch/arm64/include/asm/pgtable-hwdef.h diff1 | diff2 | blob | history
arch/arm64/mm/mmu.c diff1 | diff2 | blob | history
arch/cris/arch-v32/kernel/setup.c diff1 | diff2 | blob | history
arch/ia64/Kconfig diff1 | diff2 | blob | history
arch/mips/Kconfig diff1 | diff2 | blob | history
arch/mips/include/asm/elf.h diff1 | diff2 | blob | history
arch/parisc/include/asm/Kbuild diff1 | diff2 | blob | history
arch/powerpc/Kconfig diff1 | diff2 | blob | history
arch/s390/Kconfig diff1 | diff2 | blob | history
arch/s390/include/asm/elf.h diff1 | diff2 | blob | history
arch/s390/mm/mmap.c diff1 | diff2 | blob | history
arch/tile/Kconfig diff1 | diff2 | blob | history
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/include/asm/elf.h diff1 | diff2 | blob | history
arch/x86/include/asm/paravirt.h diff1 | diff2 | blob | history
arch/x86/kernel/signal.c diff1 | diff2 | blob | history
arch/x86/mm/pgtable.c diff1 | diff2 | blob | history
arch/x86/xen/mmu.c diff1 | diff2 | blob | history
drivers/base/memory.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_drv.h diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c diff1 | diff2 | blob | history
drivers/parisc/ccio-dma.c diff1 | diff2 | blob | history
drivers/parisc/sba_iommu.c diff1 | diff2 | blob | history
drivers/rtc/class.c diff1 | diff2 | blob | history
drivers/rtc/interface.c diff1 | diff2 | blob | history
drivers/rtc/rtc-mc13xxx.c diff1 | diff2 | blob | history
drivers/rtc/rtc-s5m.c diff1 | diff2 | blob | history
fs/affs/file.c diff1 | diff2 | blob | history
fs/cifs/connect.c diff1 | diff2 | blob | history
fs/cifs/file.c diff1 | diff2 | blob | history
fs/dax.c diff1 | diff2 | blob | history
fs/ext2/file.c diff1 | diff2 | blob | history
fs/ext2/inode.c diff1 | diff2 | blob | history
fs/ext4/ext4.h diff1 | diff2 | blob | history
fs/ext4/file.c diff1 | diff2 | blob | history
fs/ext4/fsync.c diff1 | diff2 | blob | history
fs/ext4/inode.c diff1 | diff2 | blob | history
fs/ext4/namei.c diff1 | diff2 | blob | history
fs/fat/file.c diff1 | diff2 | blob | history
fs/fat/inode.c diff1 | diff2 | blob | history
fs/hfsplus/inode.c diff1 | diff2 | blob | history
fs/hugetlbfs/inode.c diff1 | diff2 | blob | history
fs/locks.c diff1 | diff2 | blob | history
fs/nfsd/Kconfig diff1 | diff2 | blob | history
fs/nilfs2/inode.c diff1 | diff2 | blob | history
fs/ocfs2/aops.c diff1 | diff2 | blob | history
fs/splice.c diff1 | diff2 | blob | history
include/linux/fs.h diff1 | diff2 | blob | history
include/linux/io.h diff1 | diff2 | blob | history
include/linux/rtc.h diff1 | diff2 | blob | history
init/Kconfig diff1 | diff2 | blob | history
init/main.c diff1 | diff2 | blob | history
kernel/cgroup.c diff1 | diff2 | blob | history
kernel/cpuset.c diff1 | diff2 | blob | history
kernel/sysctl.c diff1 | diff2 | blob | history
kernel/watchdog.c diff1 | diff2 | blob | history
lib/Kconfig.debug diff1 | diff2 | blob | history
mm/filemap.c diff1 | diff2 | blob | history
mm/shmem.c diff1 | diff2 | blob | history
sound/soc/codecs/pcm512x.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules