From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 1 Jul 2010 06:49:28 +0000 (+0200)
Subject: Merge branch 'linus' into core/rcu
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0a54cec0c25cc49e3b68b14c205f1f6cff13f5e1;p=mv-sheeva.git

Merge branch 'linus' into core/rcu

Conflicts:
	fs/fs-writeback.c

Merge reason: Resolve the conflict

Note, i picked the version from Linus's tree, which effectively reverts
the fs-writeback.c bits of:

  b97181f: fs: remove all rcu head initializations, except on_stack initializations

As the upstream changes to this file changed this code heavily and the
first attempt to resolve the conflict resulted in a non-booting kernel.
It's safer to re-try this portion of the commit cleanly.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

0a54cec0c25cc49e3b68b14c205f1f6cff13f5e1