From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 28 Oct 2010 03:44:47 +0000 (-0400)
Subject: Merge branch 'next' into upstream-merge
X-Git-Tag: v2.6.37-rc1~76^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a107e5a3a473a2ea62bd5af24e11b84adf1486ff;p=pandora-kernel.git

Merge branch 'next' into upstream-merge

Conflicts:
	fs/ext4/inode.c
	fs/ext4/mballoc.c
	include/trace/events/ext4.h
---

a107e5a3a473a2ea62bd5af24e11b84adf1486ff
Reading git-diff-tree failed