Merge commit 'v2.6.32' into reiserfs/kill-bkl
Frederic Weisbecker [Mon, 7 Dec 2009 06:28:35 +0000 (07:28 +0100)]
Merge-reason: The tree was based 2.6.31. It's better to be up to date
with 2.6.32. Although no conflicting changes were made in between,
it gives benchmarking results closer to the lastest kernel behaviour.

1  2 
fs/reiserfs/super.c

Simple merge