projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0891ad8 54563d4)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Nov 2013 19:57:05 +0000 (11:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Nov 2013 19:57:05 +0000 (11:57 -0800)
commitffd3c0260aeeb1fd4d36378d2e06e6410661dd0f
treeb9503b99442b9701fab49a83295e60256827cdd2tree | snapshot
parent0891ad829d2a0501053703df66029e843e3b8365commit | diff
parent54563d41a58be77e9bd9ef7af1ea4026cf0e7e07commit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/mason/linux-btrfs

Pull btrfs fixes from Chris Mason:
 "This pull fixes the empty_zero_page bug that Heiko reported, and
  includes one more cleanup from Al Viro"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: get rid of fdentry()
  btrfs: fix empty_zero_page misusage
John Crispins staging tree