On Thu, Jul 16, 2015 at 04:07:39PM +0900, Alexandre Courbot wrote: > Hi linux-firmware maintainers, > > The following changes since commit 696403047a940c425c93cb8da1efcec6ffda0b6e: > > linux-firmware: Add firmware file for Intel Bluetooth 8260 (2015-07-14 > 17:05:20 -0400) > > are available in the git repository at: > > https://github.com/Gnurou/linux-firmware.git master > > for you to fetch changes up to 899ebcb6812681b91cf2dfd390574b478c612442: > > firmware: tegra: add GK20A FECS/GPCCS firmware (2015-07-16 15:59:03 +0900) > > The first patch also strips a few lines that seem to remain from a git merge > or rebase conflict. > > ---------------------------------------------------------------- > Alexandre Courbot (2): > Remove patch conflict remains > firmware: tegra: add GK20A FECS/GPCCS firmware pulled. thanks for noticing the merge markers. :) --kyle -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html