Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 May 2010 14:41:47 +0000 (07:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 May 2010 14:41:47 +0000 (07:41 -0700)
commit3e766fd41ddc31c47ec5b2840c6a45803d35ff40
treef007442f20757918aa024dda848baa7670baa580
parent4fd5ec509bd486b5dd8cac1a4d4d7e2cbdf7c546
parent7845bc3e132605e3e8a1f37748e29281164b65f5
Merge git://git./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