git.apps.os.sepia.ceph.com Git - ceph-client.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit

author	David S. Miller <davem@davemloft.net>
	Thu, 13 Aug 2009 00:44:53 +0000 (17:44 -0700)
committer	David S. Miller <davem@davemloft.net>
	Thu, 13 Aug 2009 00:44:53 +0000 (17:44 -0700)
commit	aa11d958d1a6572eda08214d7c6a735804fe48a5
tree	d025b05270ad1e010660d17eeadc6ac3c1abbd7d	tree \| snapshot
parent	07f6642ee9418e962e54cbc07471cfe2e559c568	commit \| diff
parent	9799218ae36910af50f002a5db1802d576fffb43	commit \| diff

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

Conflicts:
arch/microblaze/include/asm/socket.h

61 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/mips/ar7/platform.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-n32.S	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-o32.S	diff1 \|	diff2 \|	blob \| history
drivers/misc/sgi-xp/xpnet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/3c59x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/a2065.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bmac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/epic100.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fealnx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.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/irda/w83977af_ir.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_82598.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_type.h	diff1 \|	diff2 \|	blob \| history
drivers/net/mlx4/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/mlx4/en_tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/natsemi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pci-skeleton.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/nmclan_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcnet32.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp_generic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sky2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/starfire.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sundance.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tulip/de2104x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tulip/tulip_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tulip/winbond-840.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wan/sbni.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ar9170/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ar9170/usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/ipw2200.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl3945-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwmc3200wifi/commands.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/assoc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwl8k.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ray_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wavelan_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/yellowfin.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/stlc45xx/stlc45xx.c	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/net_namespace.c	diff1 \|	diff2 \|	blob \| history
net/dccp/proto.c	diff1 \|	diff2 \|	blob \| history
net/econet/af_econet.c	diff1 \|	diff2 \|	blob \| history
net/ieee802154/af_ieee802154.c	diff1 \|	diff2 \|	blob \| history
net/ieee802154/dgram.c	diff1 \|	diff2 \|	blob \| history
net/ieee802154/raw.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.h	diff1 \|	diff2 \|	blob \| history
net/wireless/scan.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/mips/ar7/platform.c	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-n32.S	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-o32.S	diff1 \|	diff2 \|	blob \| history
drivers/misc/sgi-xp/xpnet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/3c59x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/a2065.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bmac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/epic100.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fealnx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.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/irda/w83977af_ir.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_82598.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_type.h	diff1 \|	diff2 \|	blob \| history
drivers/net/mlx4/en_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/mlx4/en_tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/natsemi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pci-skeleton.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/nmclan_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcnet32.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp_generic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sky2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/starfire.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sundance.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tulip/de2104x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tulip/tulip_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tulip/winbond-840.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wan/sbni.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ar9170/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ar9170/usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/ipw2200.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl3945-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwmc3200wifi/commands.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/assoc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwl8k.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ray_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wavelan_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/yellowfin.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/stlc45xx/stlc45xx.c	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/net_namespace.c	diff1 \|	diff2 \|	blob \| history
net/dccp/proto.c	diff1 \|	diff2 \|	blob \| history
net/econet/af_econet.c	diff1 \|	diff2 \|	blob \| history
net/ieee802154/af_ieee802154.c	diff1 \|	diff2 \|	blob \| history
net/ieee802154/dgram.c	diff1 \|	diff2 \|	blob \| history
net/ieee802154/raw.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.h	diff1 \|	diff2 \|	blob \| history
net/wireless/scan.c	diff1 \|	diff2 \|	blob \| history