diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-02-02 23:09:32 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-02 23:09:32 -0500 |
| commit | 59fa534874e6779082275d12d950e26c67c86498 (patch) | |
| tree | 399407f2a84b08d6153b649f834b4693569af369 /net/ipv4/tcp_input.c | |
| parent | via-rhine: Fix bugs in NAPI support. (diff) | |
| parent | can: c_can: Set reserved bit in IFx_MASK2 to 1 on write (diff) | |
| download | linux-dev-59fa534874e6779082275d12d950e26c67c86498.tar.xz linux-dev-59fa534874e6779082275d12d950e26c67c86498.zip | |
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>
Diffstat (limited to 'net/ipv4/tcp_input.c')
0 files changed, 0 insertions, 0 deletions