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: 1d479a8 665c1e6)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Dec 2011 06:02:31 +0000 (17:02 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Dec 2011 06:02:31 +0000 (17:02 +1100)
commit	664a4db6e38070b0942745379ea37c08a7dd457b
tree	06cd60b56b135202b30e2b915d31b1d97365cd06	tree \| snapshot
parent	1d479a83d6f81d35116e57e3e8862ae8340ec3c1	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