From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 23 Sep 2011 04:45:27 +0000 (+1000)
Subject: Merge remote-tracking branch 'tmem/tmem'
X-Git-Tag: next-20110923~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=587d51e61cd3545101a29a6dada52da79cbb1c55;p=karo-tx-linux.git

Merge remote-tracking branch 'tmem/tmem'

Conflicts:
	mm/cleancache.c
---

587d51e61cd3545101a29a6dada52da79cbb1c55