From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 7 Feb 2009 17:31:54 +0000 (+0100)
Subject: Merge branch 'linus' into core/locking
X-Git-Tag: firefly_0821_release~14011^2~52
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=673f8205914a12e928c65afbcd78ae748f78df53;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linus' into core/locking

Conflicts:
	fs/btrfs/locking.c
---

673f8205914a12e928c65afbcd78ae748f78df53