git.monstr.eu Git - linux-2.6-microblaze.git/commit

projects / linux-2.6-microblaze.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5a147e8 cea0d76)

author	David S. Miller <davem@davemloft.net>
	Wed, 12 May 2010 07:05:35 +0000 (00:05 -0700)
committer	David S. Miller <davem@davemloft.net>
	Wed, 12 May 2010 07:05:35 +0000 (00:05 -0700)
commit	278554bd6579206921f5d8a523649a7a57f8850d
tree	4e6c527daf0910e455b3aa72e2c96b0479e430be	tree
parent	5a147e8bf982f9dd414c1dd751fe02c1942506b2	commit \| diff
parent	cea0d767c29669bf89f86e4aee46ef462d2ebae8	commit \| diff

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_tcp.c
net/ipv4/ipmr.c

18 files changed:

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/arm/ep93xx_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/micrel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ar9170/usb.c	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history
include/net/sctp/sm.h	diff1 \|	diff2 \|	blob \| history
include/net/sctp/structs.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipmr.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/af_inet6.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/datagram.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_sideeffect.c	diff1 \|	diff2 \|	blob \| history
net/sctp/transport.c	diff1 \|	diff2 \|	blob \| history

MicroBlaze GIT Repository