tree 40cdcac3bff0ee40cc33dcca61d0577cdf965f77
parent c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3
parent 30ff056c42c665b9ea535d8515890857ae382540
author David S. Miller <davem@davemloft.net> 1267413786 -0800
committer David S. Miller <davem@davemloft.net> 1267413786 -0800

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/firmware/iscsi_ibft.c