]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ef6e250 49de614)
Merge remote-tracking branch 'vfs/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 01:36:45 +0000 (11:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 01:36:48 +0000 (11:36 +1000)
commitae342cd7388feeb178404c0ca35b04f098576fcf
tree9dfb9d9a770fb4e3ec28fd0d7719373e849d9799tree | snapshot
parentef6e250e90a4b503451f4666e4f79a634dde2a91commit | diff
parent49de614c74fadc7c47132ac87c0f7b05ca4084b7commit | diff
Merge remote-tracking branch 'vfs/for-next'

Conflicts:
drivers/staging/android/binder.c
net/socket.c
62 files changed:
arch/alpha/kernel/osf_sys.c diff1 | diff2 | blob | history
arch/ia64/kernel/perfmon.c diff1 | diff2 | blob | history
arch/s390/hypfs/inode.c diff1 | diff2 | blob | history
arch/um/drivers/mconsole_kern.c diff1 | diff2 | blob | history
drivers/infiniband/core/ucma.c diff1 | diff2 | blob | history
drivers/staging/android/binder.c diff1 | diff2 | blob | history
drivers/staging/omapdrm/omap_gem.c diff1 | diff2 | blob | history
drivers/tty/tty_io.c diff1 | diff2 | blob | history
drivers/usb/gadget/f_fs.c diff1 | diff2 | blob | history
drivers/video/msm/mdp.c diff1 | diff2 | blob | history
fs/9p/v9fs.c diff1 | diff2 | blob | history
fs/adfs/super.c diff1 | diff2 | blob | history
fs/affs/super.c diff1 | diff2 | blob | history
fs/befs/linuxvfs.c diff1 | diff2 | blob | history
fs/bfs/inode.c diff1 | diff2 | blob | history
fs/btrfs/extent_io.c diff1 | diff2 | blob | history
fs/btrfs/inode.c diff1 | diff2 | blob | history
fs/btrfs/ioctl.c diff1 | diff2 | blob | history
fs/cifs/cifsfs.c diff1 | diff2 | blob | history
fs/compat_ioctl.c diff1 | diff2 | blob | history
fs/dcache.c diff1 | diff2 | blob | history
fs/ecryptfs/main.c diff1 | diff2 | blob | history
fs/ext3/super.c diff1 | diff2 | blob | history
fs/ext4/ioctl.c diff1 | diff2 | blob | history
fs/ext4/super.c diff1 | diff2 | blob | history
fs/fat/inode.c diff1 | diff2 | blob | history
fs/fuse/dev.c diff1 | diff2 | blob | history
fs/fuse/inode.c diff1 | diff2 | blob | history
fs/hfs/super.c diff1 | diff2 | blob | history
fs/hpfs/super.c diff1 | diff2 | blob | history
fs/hugetlbfs/inode.c diff1 | diff2 | blob | history
fs/isofs/inode.c diff1 | diff2 | blob | history
fs/jfs/super.c diff1 | diff2 | blob | history
fs/locks.c diff1 | diff2 | blob | history
fs/logfs/inode.c diff1 | diff2 | blob | history
fs/minix/inode.c diff1 | diff2 | blob | history
fs/namei.c diff1 | diff2 | blob | history
fs/ncpfs/inode.c diff1 | diff2 | blob | history
fs/nfs/inode.c diff1 | diff2 | blob | history
fs/nfsd/nfs4state.c diff1 | diff2 | blob | history
fs/ntfs/super.c diff1 | diff2 | blob | history
fs/ocfs2/cluster/heartbeat.c diff1 | diff2 | blob | history
fs/open.c diff1 | diff2 | blob | history
fs/proc/base.c diff1 | diff2 | blob | history
fs/qnx4/inode.c diff1 | diff2 | blob | history
fs/qnx6/inode.c diff1 | diff2 | blob | history
fs/stat.c diff1 | diff2 | blob | history
fs/sysv/inode.c diff1 | diff2 | blob | history
fs/ubifs/super.c diff1 | diff2 | blob | history
fs/udf/super.c diff1 | diff2 | blob | history
fs/xattr.c diff1 | diff2 | blob | history
fs/xfs/xfs_super.c diff1 | diff2 | blob | history
include/linux/net.h diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
kernel/events/core.c diff1 | diff2 | blob | history
kernel/exit.c diff1 | diff2 | blob | history
kernel/taskstats.c diff1 | diff2 | blob | history
net/9p/trans_fd.c diff1 | diff2 | blob | history
net/core/netprio_cgroup.c diff1 | diff2 | blob | history
net/core/scm.c diff1 | diff2 | blob | history
net/sctp/socket.c diff1 | diff2 | blob | history
net/socket.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules