diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-25 11:19:38 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-25 11:19:38 -0700 |
commit | 32fd3d4ac93261616564fbb544738b260f89bc7e (patch) | |
tree | 9325c092eba3def020fe6c6a80c70600428e0822 /drivers | |
parent | 33b40178cb3bd75294d1a758b3f509a0d38682ab (diff) | |
parent | 5f867db63473f32cce1b868e281ebd42a41f8fad (diff) |
Merge tag 'for-linus-20150724' of git://git.infradead.org/linux-mtd
Pull MTD fixes from Brian Norris:
"Two trivial updates. I meant to send these much earlier, but I've
been preoccupied.
- Add MAINTAINERS entry for diskonchip g3 driver
- Fix an overlooked conflict in bitfield value assignments
The latter update is a bit overdue, but there's no reason to wait any
longer"
* tag 'for-linus-20150724' of git://git.infradead.org/linux-mtd:
mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict
MAINTAINERS: mtd: docg3: add docg3 maintainer
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions