Hi, I've fetched both the raspberry pi 3.14 kernel and net-next. Instead of trying to merge the net-next master branch on the raspberry pi rpi-3.14y branch (due to conflicts) I would try to checkout only the linux-zigbee files from net-next master on rpi-3.14y as described here:
http://jasonrudolph.com/blog/2009/02/25/git-tip-how-to-merge-specific-files-from-another-branch/ What paths should I checkout from net-next. Grazie, Cristiano ------------------------------------------------------------------------------ "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE Instantly run your Selenium tests across 300+ browser/OS combos. Get unparalleled scalability from the best Selenium testing platform available Simple to use. Nothing to install. Get started now for free." http://p.sf.net/sfu/SauceLabs _______________________________________________ Linux-zigbee-devel mailing list Linux-zigbee-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-zigbee-devel
