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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 16 Nov 2011 01:17:41 +0000 (12:17 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 16 Nov 2011 01:17:41 +0000 (12:17 +1100)
commit	96c97a0c7b481af34a09d76f18e5db833b82606e
tree	4b9b43a0a3950de641075e2a2b0a1542a92f15ba	tree \| snapshot
parent	e75fe879749b05bd8d02f865704d2d585d3dc4f5	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