projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ebfa57 1dcffad)
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
authorLinus Torvalds <[email protected]>
Fri, 15 Apr 2011 14:44:22 +0000 (07:44 -0700)
committerLinus Torvalds <[email protected]>
Fri, 15 Apr 2011 14:44:22 +0000 (07:44 -0700)
* 'linux-next' of git://git.infradead.org/ubifs-2.6:
  UBIFS: fix compilation warnings when compiling with gcc 4.5
  UBIFS: fix oops when R/O file-system is fsync'ed


Trivial merge
John Crispins staging tree