Merge commit 'v2.6.32' into reiserfs/kill-bkl
authorFrederic Weisbecker <fweisbec@gmail.com>
Mon, 7 Dec 2009 06:28:35 +0000 (07:28 +0100)
committerFrederic Weisbecker <fweisbec@gmail.com>
Mon, 7 Dec 2009 06:29:22 +0000 (07:29 +0100)
commit6548698f929814375fa5d62ae1db96959b0418c1
tree340924ae82cb0946aa15045b2b72186de52a8146
parent1d2c6cfd40b2dece3bb958cbbc405a2c1536ab75
parent22763c5cf3690a681551162c15d34d935308c8d7
Merge commit 'v2.6.32' into reiserfs/kill-bkl

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.
fs/reiserfs/super.c