From: David S. Miller <davem@davemloft.net>
Date: Fri, 18 Jul 2008 09:39:39 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.27-rc1~969^2~51
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49997d75152b3d23c53b0fa730599f2f74c92c65;p=pandora-kernel.git

Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6

Conflicts:

	Documentation/powerpc/booting-without-of.txt
	drivers/atm/Makefile
	drivers/net/fs_enet/fs_enet-main.c
	drivers/pci/pci-acpi.c
	net/8021q/vlan.c
	net/iucv/iucv.c
---

49997d75152b3d23c53b0fa730599f2f74c92c65
Reading git-diff-tree failed