git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d29cecd 96fa2b5)

author	David S. Miller <davem@davemloft.net>
	Sat, 5 Dec 2009 23:22:26 +0000 (15:22 -0800)
committer	David S. Miller <davem@davemloft.net>
	Sat, 5 Dec 2009 23:22:26 +0000 (15:22 -0800)
commit	28b4d5cc17c20786848cdc07b7ea237a309776bb
tree	bae406a4b17229dcce7c11be5073f7a67665e477	tree \| snapshot
parent	d29cecda036f251aee4947f47eea0fe9ed8cc931	commit \| diff
parent	96fa2b508d2d3fe040cf4ef2fffb955f0a537ea1	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/axnet_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/fmvj18x_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/nmclan_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/pcnet_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/smc91c92_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/xirc2ps_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ray_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl3501_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/netwave/netwave_cs.c	diff1 \|	\|	blob \| history
drivers/staging/wavelan/wavelan_cs.c	diff1 \|	\|	blob \| history
include/linux/net.h	diff1 \|	diff2 \|	blob \| history
net/core/sysctl_net_core.c	diff1 \|	diff2 \|	blob \| history
security/lsm_audit.c	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree