Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Jun 2011 02:04:21 +0000 (19:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Jun 2011 02:04:21 +0000 (19:04 -0700)
commit9c125d2af8f4d06ea62a4d8ff100af392a0a3a3b
treea8ba80d7d5c9385d4b8624a9cee9b9cebc5f1382
parent40182373ac6cbbd10c6d08ba339947eea009d513
parent1adffbae22332bb558c2a29de19d9aca391869f6
Merge git://git./linux/kernel/git/hirofumi/fatfs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
  fat: Fix corrupt inode flags when remove ATTR_SYS flag