Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Aug 2010 18:47:36 +0000 (11:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Aug 2010 18:47:36 +0000 (11:47 -0700)
commit8196867c74890ccdf40a2b5e3e173597fbc4f9ac
tree3bb2df18233327ed9fd3bdd3da2f84cefe7d5611
parent8c8946f509a494769a8c602b5ed189df01917d39
parentffc18879903e55487bc5ac3c774b99a07de06029
Merge branch 'for-linus' of git://git./linux/kernel/git/bcopeland/omfs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs:
  omfs: fix uninitialized variable warning
  omfs: sanity check cluster size
  omfs: refuse to mount if bitmap pointer is obviously wrong
  omfs: check bounds on block numbers before passing to sb_bread
  omfs: fix memory leak
fs/omfs/file.c
fs/omfs/inode.c