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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 2 Dec 2011 02:43:38 +0000 (13:43 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 2 Dec 2011 02:43:38 +0000 (13:43 +1100)
commit	083df96910c0253417d29d64570bba19818b39d8
tree	9e0393601ebcf53656138a05b479bffdc7a46721	tree \| snapshot
parent	968af53edd6609a00034dfead998c1644383c757	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