diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-18 11:19:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-18 11:19:16 -0800 |
| commit | 19c52240a6be6332d73b54cb20e69dab3641b393 (patch) | |
| tree | 866659f036c69cdd42ddc550e3b2e22db580ecc1 /arch/arc/kernel/setup.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | doc: dt: mtd: partitions: add compatible property to "partitions" node (diff) | |
| download | linux-dev-19c52240a6be6332d73b54cb20e69dab3641b393.tar.xz linux-dev-19c52240a6be6332d73b54cb20e69dab3641b393.zip | |
Merge tag 'for-linus-20151217' of git://git.infradead.org/linux-mtd
Pull MTD fixes from Brian Norris:
"I was holding out on this pull request for a bit, since there are a
few other small issues being discussed that look like 4.4-rc
regressions. Hopefully I can get those stabilized soon, but these are
ready at any rate:
- A little bit of a last-minute change for the device tree "fixed
partition" binding. This is needed because we might want to reuse
the 'partitions' subnode for other sorts of partitioning
descriptions -- e.g., for describing which on-flash partition
format(s) might be used on the system.
- Also tone down a warning message, since it is probably going to
show up on a lot of systems where it should just be ignored"
* tag 'for-linus-20151217' of git://git.infradead.org/linux-mtd:
doc: dt: mtd: partitions: add compatible property to "partitions" node
mtd: ofpart: don't complain about missing 'partitions' node too loudly
Diffstat (limited to 'arch/arc/kernel/setup.c')
0 files changed, 0 insertions, 0 deletions