From: David S. Miller <davem@davemloft.net>
Date: Sun, 23 Mar 2008 01:22:42 +0000 (-0700)
Subject: Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.26-rc1~1138^2~390
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76fef2b6bffa13ad7ccd54c0493b053295721b9a;p=pandora-kernel.git

Merge branch 'upstream-net26' of /linux/kernel/git/jgarzik/netdev-2.6

Conflicts:

	drivers/s390/net/qeth_main.c
---

76fef2b6bffa13ad7ccd54c0493b053295721b9a
Reading git-diff-tree failed