From: Dave Jones <davej@redhat.com>
Date: Thu, 29 Jun 2006 20:01:54 +0000 (-0400)
Subject: Merge ../linus
X-Git-Tag: v2.6.18-rc1~352^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55b4d6a52195a8f277ffddf755ddaff359878f41;p=pandora-kernel.git

Merge ../linus

Conflicts:

	drivers/char/agp/Kconfig
---

55b4d6a52195a8f277ffddf755ddaff359878f41
Reading git-diff-tree failed