]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
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)
Conflicts:
mm/cleancache.c

1  2 
drivers/staging/zcache/zcache-main.c
include/linux/swap.h
mm/filemap.c

Simple merge
Simple merge
diff --cc mm/filemap.c
Simple merge