Merge branch 'linus' into core/rcu
Ingo Molnar [Thu, 1 Jul 2010 06:49:28 +0000 (08:49 +0200)]
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>

1  2 
net/bridge/br_fdb.c

Simple merge