tree eb4e63ee9ae1fcaf9aa53a1668e55c09516052d9
parent ec8c27e04f89a7575ca2c4facb99152e03d6a99c
parent 980019d74e4b2428362b36a0506519d6d9460800
author Ingo Molnar <mingo@elte.hu> 1277966968 +0200
committer Ingo Molnar <mingo@elte.hu> 1277969485 +0200

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>