Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Apr 2009 04:25:53 +0000 (21:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Apr 2009 04:25:53 +0000 (21:25 -0700)
commit9ea66ab5805daafc60ccb16dd617f610832c76bb
tree0a1d02c078ffe88ff6c0efb07b974f0a0fa2f82e
parent93acda847f42aa3ca6d0107845fd59a6041b13e2
parentac20100df7a7a042423dcb8847f42d9f6ddb8d00
Merge branch 'for-linus' of git://git./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