diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-02 18:49:06 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-02 18:49:06 +0200 |
commit | ca55bd7e2905d344bf697f7c2cc347cb42999e7a (patch) | |
tree | f2b45dcfd55e72398d29320d2b3b9c3bace94a85 /drivers/memstick | |
parent | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff) | |
parent | net_cls: fix unconfigured struct tcf_proto keeps chaining and avoid kernel pa... (diff) | |
download | linux-ca55bd7e2905d344bf697f7c2cc347cb42999e7a.tar.xz linux-ca55bd7e2905d344bf697f7c2cc347cb42999e7a.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
net_cls: fix unconfigured struct tcf_proto keeps chaining and avoid kernel panic when we use cls_cgroup
e1000: add missing length check to e1000 receive routine
forcedeth: add phy_power_down parameter, leave phy powered up by default (v2)
Bluetooth: Remove useless flush_work() causing lockdep warnings
Diffstat (limited to 'drivers/memstick')
0 files changed, 0 insertions, 0 deletions