Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
commit28b4d5cc17c20786848cdc07b7ea237a309776bb
authorDavid S. Miller <davem@davemloft.net>
Sat, 5 Dec 2009 23:22:26 +0000 (5 15:22 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 5 Dec 2009 23:22:26 +0000 (5 15:22 -0800)
treebae406a4b17229dcce7c11be5073f7a67665e477
parentd29cecda036f251aee4947f47eea0fe9ed8cc931
parent96fa2b508d2d3fe040cf4ef2fffb955f0a537ea1
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
drivers/net/pcmcia/fmvj18x_cs.c
drivers/net/pcmcia/nmclan_cs.c
drivers/net/pcmcia/xirc2ps_cs.c
drivers/net/wireless/ray_cs.c
17 files changed:
Documentation/kernel-parameters.txt
MAINTAINERS
drivers/net/pcmcia/axnet_cs.c
drivers/net/pcmcia/fmvj18x_cs.c
drivers/net/pcmcia/nmclan_cs.c
drivers/net/pcmcia/pcnet_cs.c
drivers/net/pcmcia/smc91c92_cs.c
drivers/net/pcmcia/xirc2ps_cs.c
drivers/net/wireless/libertas/if_cs.c
drivers/net/wireless/ray_cs.c
drivers/net/wireless/wl3501_cs.c
drivers/staging/netwave/netwave_cs.c
drivers/staging/wavelan/wavelan_cs.c
include/linux/net.h
net/core/sysctl_net_core.c
security/lsm_audit.c
security/selinux/hooks.c