]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tmem/tmem'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 04:45:27 +0000 (14:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 04:45:27 +0000 (14:45 +1000)
commit587d51e61cd3545101a29a6dada52da79cbb1c55
tree00760df8d7f46f94aaed7f5b1a32b85f1eb16d80
parentcafcc2b97c4732eb390fa98ab284dc0c540c49f6
parent665c1e6acbfb4c3b1476a299e383e68c54867cca
Merge remote-tracking branch 'tmem/tmem'

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