From: Paul Mundt Date: Wed, 4 Aug 2010 02:56:17 +0000 (+0900) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 X-Git-Tag: v2.6.36-rc1~102^2^2^2~1^2~15 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=701ec7a7b04a62c74ab1b83b59a3fd35c0ba5fdb;p=pandora-kernel.git Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6 Conflicts: arch/arm/configs/ap4evb_defconfig arch/arm/configs/g3evm_defconfig arch/arm/configs/g4evm_defconfig Signed-off-by: Paul Mundt --- 701ec7a7b04a62c74ab1b83b59a3fd35c0ba5fdb Reading git-diff-tree failed