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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 17 Nov 2011 02:38:06 +0000 (13:38 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 17 Nov 2011 02:38:06 +0000 (13:38 +1100)
commit	496d6bf66841802ece6af44c5395fed549a9f046
tree	e4029db4ca79cbcbd74703a8995c2a7f18adf8a2	tree \| snapshot
parent	a118adc385d8916f76fcd72862114087ce66e874	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