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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 7 Dec 2011 04:51:15 +0000 (15:51 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 7 Dec 2011 04:51:15 +0000 (15:51 +1100)
commit	77edfa96ae5475b5d7829cbf80c2245a29f23fa8
tree	b75f8e4a2556ac29065bbf236c2523164f1e1ecd	tree \| snapshot
parent	c15c84ea68948857b6454a39c7b7f6c0f09ae6a4	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