Merge branch 'fixes-for-3.8' of git://gitorious.org/linux-can/linux-can
authorDavid S. Miller <davem@davemloft.net>
Sun, 3 Feb 2013 04:09:32 +0000 (23:09 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 3 Feb 2013 04:09:32 +0000 (23:09 -0500)
commit59fa534874e6779082275d12d950e26c67c86498
tree399407f2a84b08d6153b649f834b4693569af369
parent559bcac35facfed49ab4f408e162971612dcfdf3
parent2bd3bc4e8472424f1a6009825397639a8968920a
Merge branch 'fixes-for-3.8' of git://gitorious.org/linux-can/linux-can

Marc Kleine-Budde says:

====================
here's a patch for net for the v3.8 release cycle. Alexander Stein noticed that
the c_can hardware has a fixed bit in the IFx_MASK2 register. His patch fixes
writing of this register by always setting this bit.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>