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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 19 Dec 2011 06:18:17 +0000 (17:18 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 19 Dec 2011 06:18:17 +0000 (17:18 +1100)
commit	af5673eb2d87528f1607cf9294db9b3eb8dc24c9
tree	22d327bfef4176f0ebcb0cc38b4ee5328b1ef1c0	tree \| snapshot
parent	363b0858c6548702e1994c491b90751a16fd9e04	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