From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 May 2010 14:41:47 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
X-Git-Tag: v2.6.35-rc1~417
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e766fd41ddc31c47ec5b2840c6a45803d35ff40;p=thirdparty%2Fkernel%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
  fat: convert to unlocked_ioctl
  fat: Cleanup nls_unload() usage
  fat: use pack_hex_byte() instead of custom one
---

3e766fd41ddc31c47ec5b2840c6a45803d35ff40