projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 57d5488 da495ec)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Mar 2010 22:07:53 +0000 (14:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Mar 2010 22:07:53 +0000 (14:07 -0800)
commit51d0f6d1f50349579f007adf5c0b51aaedd93b94
tree6ea3f2683c3017d63101e708309665727eb2a7cctree | snapshot
parent57d54889cd00db2752994b389ba714138652e60ccommit | diff
parentda495ecc0fb096b383754952a1c152147bc95b52commit | diff
Merge git://git./linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: kfree correct pointer during mount option parsing
  Btrfs: use RB_ROOT to intialize rb_trees instead of setting rb_node to NULL
fs/btrfs/extent_map.c diff1 | diff2 | blob | history
John Crispins staging tree