| commit | cd5c2ed6fea362a295a3494ca97fa2e47f5bf49a | |
| author | David S. Miller <davem@davemloft.net> | |
| Fri, 24 Aug 2012 19:21:07 +0000 (24 15:21 -0400) | ||
| committer | David S. Miller <davem@davemloft.net> | |
| Fri, 24 Aug 2012 19:21:13 +0000 (24 15:21 -0400) | ||
| tree | b875096f5e91ad6163f26b91c3d1a6b40125350b | treesnapshot (tar.gz zip) |
| parent | d05cebb9153e500648befaa6f135e6976bbfbd84 | commitdiff |
| parent | da3d50ef308d53f216f1f92f4971f245c13e9f65 | commitdiff |
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>
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>