tree 8e6d62a3712d6a67f42dd33f193ae4c15f666666
parent c458175eb61843fe9fd37ac3d56b701e98a8cf15
parent a8c4a33b98b097e69cd1a10672c43d17ad0ffb25
author Linus Torvalds <torvalds@linux-foundation.org> 1339891301 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1339891301 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

Pull btrfs compile warning fixes from Chris Mason.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: cast devid to unsigned long long for printk %llu
  Btrfs: init old_generation in get_old_root