A moderately sized set of branches this merge window for us, about 750 patches in total. There are several fairly large cleanups, and a net negative delta(!)
1014 files changed, 39452 insertions(+), 42425 deletions(-) Most of the removal comes from two Samsung platforms being taken out (together with a couple of legacy drivers used only by them), but there's other stuff too -- removal and diet of some OMAP drivers and header files, the final folding of Marvell Kirkwood into the mvebu platform, removal of the legacy atmel pwm driver and a few more things like that. The format is nearly the same as always: I describe the conflicts in each email and I have pushed a 'resolved-3.17' branch if you want to compare. Most branches are free of conflicts, the main exception is the SoC branch and it's not horrible to deal with either. I did include one patch interspersed with the branches (6/7 is a patch), it's something Stephen was carrying locally and I think this is better to handle this way than for us to do a backmerge to handle it ourselves. I'll leave it up to you if you prefer to fold it into the 5/7 merge or apply it separately. More detailed descriptions in each pull request. I also anticipate having another short branch of misc small cleanups that we have held off applying for the second week of the merge window, but nothing major. This is by far the bulk of the contents. Please pull! Thanks, -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
