tree f007442f20757918aa024dda848baa7670baa580
parent 4fd5ec509bd486b5dd8cac1a4d4d7e2cbdf7c546
parent 7845bc3e132605e3e8a1f37748e29281164b65f5
author Linus Torvalds <torvalds@linux-foundation.org> 1274712107 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1274712107 -0700

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