diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-24 15:21:07 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-24 15:21:13 -0400 |
| commit | cd5c2ed6fea362a295a3494ca97fa2e47f5bf49a (patch) | |
| tree | b875096f5e91ad6163f26b91c3d1a6b40125350b /drivers/cpuidle | |
| parent | d05cebb9153e500648befaa6f135e6976bbfbd84 (diff) | |
| parent | da3d50ef308d53f216f1f92f4971f245c13e9f65 (diff) | |
| download | blackbird-op-linux-cd5c2ed6fea362a295a3494ca97fa2e47f5bf49a.tar.gz blackbird-op-linux-cd5c2ed6fea362a295a3494ca97fa2e47f5bf49a.zip | |
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>
Diffstat (limited to 'drivers/cpuidle')
0 files changed, 0 insertions, 0 deletions
