git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 395b228 220bf99)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 26 Mar 2010 14:55:59 +0000 (14:55 +0000)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 26 Mar 2010 14:55:59 +0000 (14:55 +0000)
Conflicts:
drivers/mtd/nand/sh_flctl.c

Maxim's patch to initialise sysfs attributes depends on the patch which
actually adds sysfs_attr_init().


Trivial merge
Pandora Kernel Repository