tree b875096f5e91ad6163f26b91c3d1a6b40125350b
parent d05cebb9153e500648befaa6f135e6976bbfbd84
parent da3d50ef308d53f216f1f92f4971f245c13e9f65
author David S. Miller <davem@davemloft.net> 1345836067 -0400
committer David S. Miller <davem@davemloft.net> 1345836073 -0400

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 <davem@davemloft.net>