tree 0a1d02c078ffe88ff6c0efb07b974f0a0fa2f82e
parent 93acda847f42aa3ca6d0107845fd59a6041b13e2
parent ac20100df7a7a042423dcb8847f42d9f6ddb8d00
author Linus Torvalds <torvalds@linux-foundation.org> 1241065553 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1241065553 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
  eCryptfs: Fix min function comparison warning
  ecryptfs: fix printk format warning