From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 3 Jul 2006 14:25:08 +0000 (-0400)
Subject: Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.19-rc1~32^2~160
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a1340c185734a57fbf4775927966ad4a1347b02;p=pandora-kernel.git

Merge git./linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/linux/kernel.h
---

0a1340c185734a57fbf4775927966ad4a1347b02
Reading git-diff-tree failed