From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Wed, 28 Mar 2012 21:58:58 +0000 (-0700)
Subject: Merge 'v2.6.39-100.5.1+3.0.25+ext4+hxge' into uek2-200
X-Git-Tag: v2.6.39-400.9.0~565
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3fca4b7abecd52a9b7fc6bed375a08cdcd2e1198;p=users%2Fjedix%2Flinux-maple.git

Merge 'v2.6.39-100.5.1+3.0.25+ext4+hxge' into uek2-200

Conflicts:
	mm/filemap.c
---

3fca4b7abecd52a9b7fc6bed375a08cdcd2e1198