Merge tag 'configfs-for-linus-2' of git://git.infradead.org/users/hch/configfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Apr 2016 21:46:56 +0000 (16:46 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Apr 2016 21:46:56 +0000 (16:46 -0500)
commit264800b5ecc7be49b2c6027738091ff3385e0cae
treefbbb39f9b564eedb42919034174453894fec8a99
parent05cf8077e54b20dddb756eaa26f3aeb5c38dd3cf
parent96c22a3293512ba684e73a981196430f524689da
Merge tag 'configfs-for-linus-2' of git://git.infradead.org/users/hch/configfs

Pull configfs fix from Christoph Hellwig:
 "A trivial fix to the recently introduced binary attribute helper
  macros"

* tag 'configfs-for-linus-2' of git://git.infradead.org/users/hch/configfs:
  configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions