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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 14 Nov 2011 02:47:20 +0000 (13:47 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 14 Nov 2011 02:47:20 +0000 (13:47 +1100)
commit	3e845a9bf01cf52ed10fed9c11ec6b02c463854d
tree	4932119af6f682a6c414433339768b52886f7a2c	tree \| snapshot
parent	1476f33c1d4e04f2a10a6ceb866b336654712aaa	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