From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date: Mon, 21 Sep 2009 09:09:22 +0000 (+0300)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7cce2f4cb7f5f641f78c8e3eea4e7b1b96cb71c0;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6 into linux-next

Conflicts:
	fs/ubifs/super.c

Merge the upstream tree in order to resolve a conflict with the
per-bdi writeback changes from the linux-2.6-block tree.
---

7cce2f4cb7f5f641f78c8e3eea4e7b1b96cb71c0