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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 8 Nov 2011 02:39:00 +0000 (13:39 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 8 Nov 2011 02:39:00 +0000 (13:39 +1100)
commit	cc4e0601a1ca2584bf08bf12ed6103bd41c514f7
tree	cfd3beade27124dc139f5e27ea2cebb48b78238d	tree \| snapshot
parent	9196eee00436f57d985baa29e812582e78fcb900	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