From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 8 Feb 2006 23:20:40 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.16-rc3~56
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cce0cac125623f9b68f25dd1350f6d616220a8dd;p=pandora-kernel.git

Merge master.kernel.org:/home/rmk/linux-2.6-arm

Manual conflict merge of arch/arm/Kconfig
---

cce0cac125623f9b68f25dd1350f6d616220a8dd
Reading git-diff-tree failed