Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 Jun 2012 00:01:41 +0000 (17:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 Jun 2012 00:01:41 +0000 (17:01 -0700)
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


Trivial merge