From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 May 2011 18:51:26 +0000 (-0700)
Subject: Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
X-Git-Tag: v3.0-rc1~316
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4d429480352c63db2228489f0db9fd381cdc3c9c;p=~emulex%2Finfiniband.git

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

* 'linux-next' of git://git.infradead.org/ubi-2.6:
  UBI: switch to dynamic printks
  UBI: turn some macros into static inline
  UBI: improve checking in debugging prints
  UBI: fix typo in a message
  UBI: fix minor stylistic issues
  UBI: use __packed instead of __attribute__((packed))
  UBI: cleanup comments around volume properties
  UBI: re-name set volume properties ioctl
  UBI: make the control character device non-seekable
---

4d429480352c63db2228489f0db9fd381cdc3c9c