]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tmem/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Sep 2011 08:02:04 +0000 (18:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Sep 2011 08:02:04 +0000 (18:02 +1000)
commit86f7e2db9abe213ddbdb71708e35baecac37b01d
treeccf734a4cb1f170e0ca4fcb885762e69e707a8ec
parent975a2daa5bc94e129bde08860d665b8e2bdb1506
parent665c1e6acbfb4c3b1476a299e383e68c54867cca
Merge remote-tracking branch 'tmem/linux-next'

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