From: David S. Miller <davem@davemloft.net>
Date: Sat, 11 Oct 2008 19:39:35 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.28-rc1~706^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56c5d900dbb8e042bfad035d18433476931d8f93;p=pandora-kernel.git

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

Conflicts:

	sound/core/memalloc.c
---

56c5d900dbb8e042bfad035d18433476931d8f93
Reading git-diff-tree failed