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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 24 Nov 2011 04:54:24 +0000 (15:54 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 24 Nov 2011 04:54:24 +0000 (15:54 +1100)
commit	9c6259f4dff34d58ed2300771c3da60499056175
tree	a28d1d0a6c65112ded351c014ea16fdf40834657	tree \| snapshot
parent	4dc3cd929f4b1de72df982246f60f9dc8ea884ce	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