Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 May 2010 14:23:12 +0000 (07:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 May 2010 14:23:12 +0000 (07:23 -0700)
commitc316ba3b518bc35ce5aef5421135220389f4eb98
tree36bb4ab299728da14f3cd1a67d7f572d50693880
parent777cb1b53dd11dbec6157adc97e9f908f6e8458c
parentbe436f6238a17b8432b9de0212bcfc838afb1f85
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

* 'linux-next' of git://git.infradead.org/ubi-2.6:
  UBI: misc comment fixes
  UBI: fix s/then/than/ typos
  UBI: init even if MTD device cannot be attached, if built into kernel
  UBI: remove reboot notifier