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

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

author	David S. Miller <davem@davemloft.net>
	Fri, 18 Jul 2008 09:39:39 +0000 (02:39 -0700)
committer	David S. Miller <davem@davemloft.net>
	Fri, 18 Jul 2008 09:39:39 +0000 (02:39 -0700)
commit	3f27fa542e2dcb68afbd2db86a046d336d1fa3bf
tree	46e93126170d02cfec9505172e545732c1b69656	tree \| snapshot
parent	1c80e2a32d4f2906205b08e37a820ea4aac40aa3	commit \| diff
parent	f71304d47a0ec85bf160a3698528076de23b1c63	commit \| diff

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

Conflicts:

Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c

38 files changed:

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
Documentation/powerpc/booting-without-of.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_multicast.c	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb3/common.h	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb3/cxgb3_ctl_defs.h	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb3/cxgb3_offload.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fs_enet/fs_enet-main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ibm_newemac/core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macvlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/myri10ge/myri10ge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp_generic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ucc_geth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/atmel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00pci.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt61pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt73usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/zd1201.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l3_main.c	diff1 \|	diff2 \|	blob \| history
fs/compat_ioctl.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	diff1 \|	diff2 \|	blob \| history
lib/textsearch.c	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_fdb.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_stp.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/irda/irnet/irnet_ppp.c	diff1 \|	diff2 \|	blob \| history
net/iucv/af_iucv.c	diff1 \|	diff2 \|	blob \| history
net/iucv/iucv.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_netlink.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/auth_gss.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
Documentation/powerpc/booting-without-of.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_multicast.c	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb3/common.h	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb3/cxgb3_ctl_defs.h	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb3/cxgb3_offload.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fs_enet/fs_enet-main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ibm_newemac/core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macvlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/myri10ge/myri10ge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp_generic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ucc_geth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/atmel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00pci.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt61pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt73usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/zd1201.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/net/qeth_l3_main.c	diff1 \|	diff2 \|	blob \| history
fs/compat_ioctl.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	diff1 \|	diff2 \|	blob \| history
lib/textsearch.c	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_fdb.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_stp.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/irda/irnet/irnet_ppp.c	diff1 \|	diff2 \|	blob \| history
net/iucv/af_iucv.c	diff1 \|	diff2 \|	blob \| history
net/iucv/iucv.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_netlink.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/auth_gss.c	diff1 \|	diff2 \|	blob \| history