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

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

author	David S. Miller <davem@davemloft.net>
	Mon, 15 Jun 2009 10:02:23 +0000 (03:02 -0700)
committer	David S. Miller <davem@davemloft.net>
	Mon, 15 Jun 2009 10:02:23 +0000 (03:02 -0700)
commit	d27af7d215f40a36f88db4c8bed929d488bcb009
tree	8d104ec2a459346b99413b0b77421ca7b9936c1a	tree \| snapshot
parent	d1bc1910b648914f597787606f3a7e8184e7ab6e	commit \| diff
parent	76e3483111abb0c6db9fc5b42c040786e425e92a	commit \| diff

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

Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c

51 files changed:

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
Documentation/networking/can.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/tosa.c	diff1 \|	diff2 \|	blob \| history
drivers/isdn/mISDN/dsp_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/arm/ixp4xx_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/b44.h	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2.h	diff1 \|	diff2 \|	blob \| history
drivers/net/e100.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/e1000.h	diff1 \|	diff2 \|	blob \| history
drivers/net/igbvf/igbvf.h	diff1 \|	diff2 \|	blob \| history
drivers/net/mlx4/en_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/mlx4/eq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/mlx4/mr.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_mpi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tokenring/3c359.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tokenring/lanstreamer.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tokenring/olympic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/usbnet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wan/ixp4xx_hss.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rndis_wlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00lib.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wavelan_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/of/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/scsi/fcoe/fcoe.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/fcoe/libfcoe.c	diff1 \|	diff2 \|	blob \| history
include/linux/Kbuild	diff1 \|	diff2 \|	blob \| history
include/linux/if_ether.h	diff1 \|	diff2 \|	blob \| history
include/linux/net_dropmon.h	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/trace/events/napi.h	\|	\|	blob
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/drop_monitor.c	diff1 \|	diff2 \|	blob \| history
net/core/net-traces.c	diff1 \|	diff2 \|	blob \| history
net/core/netpoll.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/Kconfig	diff1 \|	diff2 \|	blob \| history
net/sched/cls_cgroup.c	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
Documentation/networking/can.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/signal.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/tosa.c	diff1 \|	diff2 \|	blob \| history
drivers/isdn/mISDN/dsp_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/arm/ixp4xx_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/b44.h	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bnx2.h	diff1 \|	diff2 \|	blob \| history
drivers/net/e100.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/e1000.h	diff1 \|	diff2 \|	blob \| history
drivers/net/igbvf/igbvf.h	diff1 \|	diff2 \|	blob \| history
drivers/net/mlx4/en_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/mlx4/eq.c	diff1 \|	diff2 \|	blob \| history
drivers/net/mlx4/mr.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_mpi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tokenring/3c359.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tokenring/lanstreamer.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tokenring/olympic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/usbnet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wan/ixp4xx_hss.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rndis_wlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00lib.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wavelan_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/of/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/scsi/fcoe/fcoe.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/fcoe/libfcoe.c	diff1 \|	diff2 \|	blob \| history
include/linux/Kbuild	diff1 \|	diff2 \|	blob \| history
include/linux/if_ether.h	diff1 \|	diff2 \|	blob \| history
include/linux/net_dropmon.h	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/trace/events/napi.h	\|	\|	blob
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/drop_monitor.c	diff1 \|	diff2 \|	blob \| history
net/core/net-traces.c	diff1 \|	diff2 \|	blob \| history
net/core/netpoll.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/Kconfig	diff1 \|	diff2 \|	blob \| history
net/sched/cls_cgroup.c	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	diff1 \|	diff2 \|	blob \| history