]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tmem/tmem'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 06:14:54 +0000 (16:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 06:14:54 +0000 (16:14 +1000)
commit29487dd9b6a04aca0de756571ec464a1e0afa064
treeefd82ab8f2edc9d8e211dcec84261259b730bd13
parent65a41bdba7d01a36c3d0a724e66b8f997dd8050d
parent665c1e6acbfb4c3b1476a299e383e68c54867cca
Merge remote-tracking branch 'tmem/tmem'

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