]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tmem/tmem'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 06:44:19 +0000 (16:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 06:44:19 +0000 (16:44 +1000)
commite5fc9970bb312539aa03427b24c87672eccde854
tree655fa8a40ca2a018368839c6c821e587bc732f21
parentac79e59be6f325f9b4ddf316f0653fe268d440f1
parent665c1e6acbfb4c3b1476a299e383e68c54867cca
Merge remote-tracking branch 'tmem/tmem'

Conflicts:
mm/cleancache.c
drivers/staging/zcache/zcache-main.c
include/linux/swap.h
mm/filemap.c