tree c9c080849a0ba421c5ba1741543f83443ad72b62
parent 59a7ac12110f27951c6f754b4e451a9df686aea9
parent 01dc9cc314ad1009f5b7356399b386015fdb0400
author Linus Torvalds <torvalds@linux-foundation.org> 1311365395 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1311365395 -0700

Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

* 'linux-next' of git://git.infradead.org/ubi-2.6:
  UBI: clarify the volume notification types' doc
  UBI: remove dead code
  UBI: dump stack when switching to R/O mode
  UBI: fix oops in error path
  UBI: switch debugging tests knobs to debugfs
  UBI: make it possible to use struct ubi_device in debug.h
  UBI: prepare debugging stuff to further debugfs conversion
  UBI: use debugfs for the extra checks knobs
  UBI: change the interface of a debugging check function