From: David S. Miller Date: Wed, 21 May 2014 05:58:30 +0000 (-0400) Subject: Merge tag 'linux-can-fixes-for-3.15-20140519' of git://gitorious.org/linux-can/linux-can X-Git-Tag: omap-for-v3.16/fixes-against-rc1~146^2~10 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8d33c3b8a42fbd9ad23a61498fa5db1d83644e0;p=pandora-kernel.git Merge tag 'linux-can-fixes-for-3.15-20140519' of git://gitorious.org/linux-can/linux-can Marc Kleine-Budde says: ==================== pull-request: can 2014-05-19 this is a pull request for net/master, for the v3.15 release cycle, with a single patch. Oliver Hartkopp's patch removes a Kconfig option in the c_can driver, which was added as a workaround during the v3.15 development. With all cleanup patches this workaround is not needed anymore. ==================== Signed-off-by: David S. Miller --- d8d33c3b8a42fbd9ad23a61498fa5db1d83644e0