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: 8fcc47b 665c1e6)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 18 Nov 2011 03:33:59 +0000 (14:33 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 18 Nov 2011 03:33:59 +0000 (14:33 +1100)
commit	880f9daa9162ec78614ba346fba80dce6d9c315b
tree	64472aa5a5a33271a97c0d80f1d59cfb35f949dc	tree \| snapshot
parent	8fcc47bb3ac359d7ff260303e8fe3cc3439d1721	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