From: David S. Miller Date: Fri, 24 Aug 2012 19:21:07 +0000 (-0400) Subject: Merge branch 'fixes-for-3.6' of git://gitorious.org/linux-can/linux-can X-Git-Tag: firefly_0821_release~3680^2~2137^2~20 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cd5c2ed6fea362a295a3494ca97fa2e47f5bf49a;p=firefly-linux-kernel-4.4.55.git Merge branch 'fixes-for-3.6' of git://gitorious.org/linux-can/linux-can Marc Kleine-Budde says: ==================== here are two fixes for the v3.6 release cycle. Alexey Khoroshilov submitted a fix for a memory leak in the softing driver (in softing_load_fw()) in case a krealloc() fails. Sven Schmitt fixed the misuse of the IRQF_SHARED flag in the irq resouce of the sja1000 platform driver, now the correct flag is used. There are no mainline users of this feature which need to be converted. ==================== Signed-off-by: David S. Miller --- cd5c2ed6fea362a295a3494ca97fa2e47f5bf49a