projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7e61b3f 5a1f36c)
Merge tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubifs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Mar 2012 16:27:40 +0000 (09:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Mar 2012 16:27:40 +0000 (09:27 -0700)
commite57f146b2837d6a2d04a8ca86cb703f509b00e98
tree0ebde713fc9bae7a0bcf626a5a66219899acd0b3tree | snapshot
parent7e61b3ff50f59f134054aaf43096c761fafecf0ccommit | diff
parent5a1f36c90c9b21a7aa31c29a1926b376dd6a11cfcommit | diff
Merge tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubifs

Pull UBIFS changes from Artem Bityutskiy:
 - Improve error messages
 - Clean-up i_nlink management
 - Minor clean-ups

* tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubifs:
  UBIFS: improve error messages
  UBIFS: kill CUR_MAX_KEY_LEN macro
  UBIFS: do not use inc_link when i_nlink is zero
  UBIFS: make the dbg_lock spinlock static
  UBIFS: increase dumps loglevel
  UBIFS: amend recovery debugging message
John Crispins staging tree