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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 29 Nov 2011 03:00:08 +0000 (14:00 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 29 Nov 2011 03:00:08 +0000 (14:00 +1100)
commit	550971833ac31eb5865abf05fadb5484c1330dd7
tree	3209c84624f28e505edbe626db2f799d7eaf4781	tree \| snapshot
parent	06d62345bbc8620e0ed66de94cb877911b4a04d8	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