From: David Woodhouse Date: Fri, 26 Mar 2010 14:55:59 +0000 (+0000) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 X-Git-Tag: v2.6.35-rc1~465^2~73 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=329f9052dbadf6f4afe2231668bd00c579a4aa10;p=pandora-kernel.git Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6 Conflicts: drivers/mtd/nand/sh_flctl.c Maxim's patch to initialise sysfs attributes depends on the patch which actually adds sysfs_attr_init(). --- 329f9052dbadf6f4afe2231668bd00c579a4aa10 Reading git-diff-tree failed