Merge ../linus

Conflicts:

	drivers/cpufreq/cpufreq.c

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c
index e3d466a228d4..b286ccb08587 100644
--- a/fs/reiserfs/bitmap.c
+++ b/fs/reiserfs/bitmap.c
@@ -708,7 +708,7 @@ static void oid_groups(reiserfs_blocknr_hint_t * hint)
  */
 static int get_left_neighbor(reiserfs_blocknr_hint_t * hint)
 {
-        struct path *path;
+        struct treepath *path;
         struct buffer_head *bh;
         struct item_head *ih;
         int pos_in_item;