]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
commitd865983292cf1e526de8aba31870794909860d5b
tree8e6d62a3712d6a67f42dd33f193ae4c15f666666
parentc458175eb61843fe9fd37ac3d56b701e98a8cf15
parenta8c4a33b98b097e69cd1a10672c43d17ad0ffb25
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