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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 12 Dec 2011 03:40:40 +0000 (14:40 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 12 Dec 2011 03:40:40 +0000 (14:40 +1100)
commit	226ce47a81a24e33f9dcce62ce4e815038d7c3ce
tree	08f246fef7df910d7e745ec55243ff93139e4c96	tree \| snapshot
parent	4b7f276a7eee785feaeccfbc18d336f13377d4c4	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