]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 15 Jun 2009 10:02:23 +0000 (03:02 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 15 Jun 2009 10:02:23 +0000 (03:02 -0700)
commit9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb
tree8d104ec2a459346b99413b0b77421ca7b9936c1a
parentca44d6e60f9de26281fda203f58b570e1748c015
parent45e3e1935e2857c54783291107d33323b3ef33c8
Merge branch 'master' of /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
Documentation/networking/can.txt
MAINTAINERS
arch/arm/kernel/signal.c
arch/arm/mach-pxa/tosa.c
drivers/isdn/mISDN/dsp_core.c
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/arm/ixp4xx_eth.c
drivers/net/b44.h
drivers/net/bnx2.c
drivers/net/bnx2.h
drivers/net/e100.c
drivers/net/e1000e/e1000.h
drivers/net/igbvf/igbvf.h
drivers/net/mlx4/en_netdev.c
drivers/net/mlx4/eq.c
drivers/net/mlx4/mr.c
drivers/net/qlge/qlge_main.c
drivers/net/qlge/qlge_mpi.c
drivers/net/r8169.c
drivers/net/tokenring/3c359.c
drivers/net/tokenring/lanstreamer.c
drivers/net/tokenring/olympic.c
drivers/net/usb/usbnet.c
drivers/net/virtio_net.c
drivers/net/wan/ixp4xx_hss.c
drivers/net/wireless/Kconfig
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/rndis_wlan.c
drivers/net/wireless/rt2x00/Kconfig
drivers/net/wireless/rt2x00/rt2x00lib.h
drivers/net/wireless/wavelan_cs.c
drivers/of/Kconfig
drivers/scsi/fcoe/fcoe.c
drivers/scsi/fcoe/libfcoe.c
include/linux/Kbuild
include/linux/if_ether.h
include/linux/net_dropmon.h
include/linux/pci_ids.h
include/linux/sched.h
include/trace/events/napi.h
net/core/dev.c
net/core/drop_monitor.c
net/core/net-traces.c
net/core/netpoll.c
net/core/skbuff.c
net/ipv6/addrconf.c
net/netfilter/Kconfig
net/sched/cls_cgroup.c
security/selinux/hooks.c