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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 30 Nov 2011 03:43:32 +0000 (14:43 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 30 Nov 2011 03:43:32 +0000 (14:43 +1100)
commit	f193ade749059c452a3046d5bdb32a673eb43e26
tree	4a6303779348c8f9a787941ef3f4e897412b6fd4	tree \| snapshot
parent	f7a0de8959ae8f2e96ed719e65b790d6a214fee1	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