Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Mon, 1 Mar 2010 03:23:06 +0000 (19:23 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 Mar 2010 03:23:06 +0000 (19:23 -0800)
commit47871889c601d8199c51a4086f77eebd77c29b0b
tree40cdcac3bff0ee40cc33dcca61d0577cdf965f77
parentc16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3
parent30ff056c42c665b9ea535d8515890857ae382540
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
drivers/firmware/iscsi_ibft.c
24 files changed:
Documentation/feature-removal-schedule.txt
Documentation/kernel-parameters.txt
MAINTAINERS
arch/powerpc/configs/ppc64_defconfig
arch/powerpc/platforms/85xx/mpc85xx_mds.c
drivers/firmware/iscsi_ibft.c
drivers/media/dvb/dvb-core/dvb_net.c
drivers/net/au1000_eth.c
drivers/net/cpmac.c
drivers/net/mace.c
drivers/net/macmace.c
drivers/net/pcmcia/smc91c92_cs.c
drivers/pci/Makefile
drivers/pci/quirks.c
drivers/staging/octeon/ethernet.c
include/linux/pci.h
include/linux/rculist.h
include/linux/rtnetlink.h
net/core/dev.c
net/core/filter.c
net/core/rtnetlink.c
net/core/sock.c
net/ipv4/route.c
net/packet/af_packet.c