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: f2f0f13 665c1e6)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 22 Nov 2011 05:46:59 +0000 (16:46 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 22 Nov 2011 05:46:59 +0000 (16:46 +1100)
commit	b05466c13b8fe9f00bee8d0e940e02ba6e3f6a87
tree	a1f92da8b45735277b20da1df6dddb39bb3806da	tree \| snapshot
parent	f2f0f13bd2607443f40241f2a8cd44d9ac47ea89	commit \| diff
parent	665c1e6acbfb4c3b1476a299e383e68c54867cca	commit \| diff

Merge remote-tracking branch 'tmem/tmem'

Conflicts:
mm/swapfile.c

drivers/staging/zcache/zcache-main.c	diff1 \|	diff2 \|	blob \| history
fs/buffer.c	diff1 \|	diff2 \|	blob \| history
fs/super.c	diff1 \|	diff2 \|	blob \| history
include/linux/swap.h	diff1 \|	diff2 \|	blob \| history
mm/Kconfig	diff1 \|	diff2 \|	blob \| history
mm/Makefile	diff1 \|	diff2 \|	blob \| history
mm/filemap.c	diff1 \|	diff2 \|	blob \| history
mm/swapfile.c	diff1 \|	diff2 \|	blob \| history
mm/truncate.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules