git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Thu, 19 Nov 2009 06:19:03 +0000 (22:19 -0800)
committer	David S. Miller <davem@davemloft.net>
	Thu, 19 Nov 2009 06:19:03 +0000 (22:19 -0800)
commit	6632c8ecd5c33d918845914bf3b5c393c0543b7d
tree	941cfafdb57c427bb6b7ebf6354ee93b2a3693b5	tree \| snapshot
parent	aa3cb4d203d6bbffa8a04cdb71ec439e2cbfe5ad	commit \| diff
parent	731217069199774164ef409414ae8c1574b5694f	commit \| diff

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/sfc/sfe4001.c
drivers/net/wireless/libertas/cmd.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/rtl8187se/Kconfig
drivers/staging/rtl8192e/Kconfig

47 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/blackfin/mach-common/entry.S	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-o32.S	diff1 \|	diff2 \|	blob \| history
arch/x86/ia32/ia32entry.S	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_sysfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb3/sge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e100.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethoc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hamachi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hamradio/baycom_epp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/igb/igb_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/falcon_boards.c	diff1 \|	\|	blob \| history
drivers/net/skge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/slip.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sungem.c	diff1 \|	diff2 \|	blob \| history
drivers/net/typhoon.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wan/cosa.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wan/dscc4.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/pio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43legacy/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/ipw2200.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-3945.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-4965.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-5000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-hcmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl3945-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwmc3200wifi/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwmc3200wifi/commands.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwmc3200wifi/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwmc3200wifi/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/prism54/islpci_dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ray_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00debug.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8187se/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192e/Kconfig	diff1 \|	diff2 \|	blob \| history
fs/compat_ioctl.c	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/blackfin/mach-common/entry.S	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-o32.S	diff1 \|	diff2 \|	blob \| history
arch/x86/ia32/ia32entry.S	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_sysfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb3/sge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e100.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethoc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hamachi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hamradio/baycom_epp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/igb/igb_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/falcon_boards.c	diff1 \|	\|	blob \| history
drivers/net/skge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/slip.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sungem.c	diff1 \|	diff2 \|	blob \| history
drivers/net/typhoon.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wan/cosa.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wan/dscc4.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/pio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43legacy/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/ipw2200.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-3945.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-4965.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-5000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-hcmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl3945-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwmc3200wifi/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwmc3200wifi/commands.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwmc3200wifi/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwmc3200wifi/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/prism54/islpci_dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ray_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00debug.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8187se/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192e/Kconfig	diff1 \|	diff2 \|	blob \| history
fs/compat_ioctl.c	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history