git.stricted.de - GitHub/exynos8895/android_kernel_samsung

author	David S. Miller <davem@davemloft.net>
	Mon, 1 Mar 2010 03:23:06 +0000 (19:23 -0800)
committer	David S. Miller <davem@davemloft.net>
	Mon, 1 Mar 2010 03:23:06 +0000 (19:23 -0800)
commit	47871889c601d8199c51a4086f77eebd77c29b0b
tree	40cdcac3bff0ee40cc33dcca61d0577cdf965f77	tree \| snapshot (tar.gz zip)
parent	c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3	commit \| diff
parent	30ff056c42c665b9ea535d8515890857ae382540	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/powerpc/configs/ppc64_defconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/85xx/mpc85xx_mds.c	diff1 \|	diff2 \|	blob \| history
drivers/firmware/iscsi_ibft.c	diff1 \|	diff2 \|	blob \| history
drivers/media/dvb/dvb-core/dvb_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/au1000_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cpmac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/mace.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macmace.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/smc91c92_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/pci/quirks.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/octeon/ethernet.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci.h	diff1 \|	diff2 \|	blob \| history
include/linux/rculist.h	diff1 \|	diff2 \|	blob \| history
include/linux/rtnetlink.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history

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