From: David S. Miller Date: Sun, 10 May 2015 02:12:17 +0000 (-0400) Subject: Merge tag 'linux-can-next-for-4.2-20150506' of git://git.kernel.org/pub/scm/linux... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=43996fdd9b5409dea7bdc73d8fe4e22ca25ccc39;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge tag 'linux-can-next-for-4.2-20150506' of git://git./linux/kernel/git/mkl/linux-can-next Marc Kleine-Budde says: ==================== pull-request: can-next 2015-05-06 this is a pull request of a seven patches for net-next/master. Andreas Gröger contributes two patches for the janz-ican3 driver. In the first patch, the documentation for already existing sysfs entries is added, the second patch adds support for another module/firmware variant. A patch by Shawn Landden makes the padding in the struct can_frame explicit. The next 4 patches target the flexcan driver, the first one is by David Jander adding some documentation, the reaming three by me add more documentation and two small code cleanups. ==================== Signed-off-by: David S. Miller --- 43996fdd9b5409dea7bdc73d8fe4e22ca25ccc39