tree 189cde09de3a52aece0493385921b4dd7e096ed2
parent dc87c55120b0a5b0c4d731183f8bb348981aba65
parent 6ed09c34b7984a978a73a855f4c2e6662acc8bdb
author Linus Torvalds <torvalds@linux-foundation.org> 1300980154 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300980154 -0700

Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6

* 'for-linus' of git://git.infradead.org/ubi-2.6:
  UBIFS: fix assertion warning and refine comments
  UBIFS: kill CONFIG_UBIFS_FS_DEBUG_CHKS
  UBIFS: use GFP_NOFS properly
  UBI: use GFP_NOFS properly