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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 7 Nov 2011 02:00:52 +0000 (13:00 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 7 Nov 2011 02:00:52 +0000 (13:00 +1100)
commit	4ea9a2c114640e3c3a6b7e1d0a4bb2d26ccb85e9
tree	89a5982af18a5493d31cae1819a2940803831fc8	tree \| snapshot
parent	82f010e9da9ad87f2f30b7156ed74ee7188b86b9	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

Linux kernel for KaRo TX COM modules