From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Jul 2011 20:09:55 +0000 (-0700)
Subject: Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
X-Git-Tag: v3.1-rc1~326
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eadc3875ebb724bc749bf604c92c6577d06158d1;p=profile%2Fivi%2Fkernel-x86-ivi.git

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
---

eadc3875ebb724bc749bf604c92c6577d06158d1