git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f019adb d9b2c87)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 12 Sep 2013 02:54:20 +0000 (12:54 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 12 Sep 2013 02:54:26 +0000 (12:54 +1000)
commit	c5d5579a19e85764b64e15f8dab68108310b301a
tree	c0352e498c1d0a68d0c2867c2570d15f565104e9	tree \| snapshot
parent	f019adbc8e4a0b9961297b01d5289acb79109959	commit \| diff
parent	d9b2c8714aef102dea95544a8cd9372b21af463f	commit \| diff

Merge remote-tracking branch 'aio/master'

Conflicts:
fs/block_dev.c
fs/nfs/direct.c

15 files changed:

drivers/staging/android/logger.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/file.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/inode.c	diff1 \|	diff2 \|	blob \| history
fs/aio.c	diff1 \|	diff2 \|	blob \| history
fs/block_dev.c	diff1 \|	diff2 \|	blob \| history
fs/ocfs2/file.c	diff1 \|	diff2 \|	blob \| history
fs/read_write.c	diff1 \|	diff2 \|	blob \| history
fs/udf/file.c	diff1 \|	diff2 \|	blob \| history
include/linux/aio.h	diff1 \|	diff2 \|	blob \| history
include/linux/migrate.h	diff1 \|	diff2 \|	blob \| history
include/linux/mm_types.h	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
mm/migrate.c	diff1 \|	diff2 \|	blob \| history
mm/page_io.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules