tree 4e6c527daf0910e455b3aa72e2c96b0479e430be
parent 5a147e8bf982f9dd414c1dd751fe02c1942506b2
parent cea0d767c29669bf89f86e4aee46ef462d2ebae8
author David S. Miller <davem@davemloft.net> 1273647935 -0700
committer David S. Miller <davem@davemloft.net> 1273647935 -0700

Merge branch 'master' of master.kernel.org:/pub/scm/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