diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-17 10:19:33 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-17 10:19:33 (GMT) |
| commit | 602e65a3b0c4f6b09fba19817ff798647a08e706 (patch) | |
| tree | 9f284a8d4e8c0fbce21031a27efab4fdac4cec9f /drivers/gpu/drm/gma500/gem.c | |
| parent | 10cc1bdd5ef65f60f570b594c4c066d763c128fb (diff) | |
| parent | 283283c4da91adc44b03519f434ee1e7e91d6fdb (diff) | |
| download | linux-602e65a3b0c4f6b09fba19817ff798647a08e706.tar.xz | |
Merge branch 'master' of git://1984.lsi.us.es/nf
Pablo Neira Ayuso says:
====================
I know that we're in fairly late stage to request pulls, but the IPVS people
pinged me with little patches with oops fixes last week.
One of them was recently introduced (during the 3.4 development cycle) while
cleaning up the IPVS netns support. They are:
* Fix one regression introduced in 3.4 while cleaning up the
netns support for IPVS, from Julian Anastasov.
* Fix one oops triggered due to resetting the conntrack attached to the skb
instead of just putting it in the forward hook, from Lin Ming. This problem
seems to be there since 2.6.37 according to Simon Horman.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpu/drm/gma500/gem.c')
0 files changed, 0 insertions, 0 deletions