| commit | 329f9052dbadf6f4afe2231668bd00c579a4aa10 | [log] [tgz] |
|---|---|---|
| author | David Woodhouse <David.Woodhouse@intel.com> | Fri Mar 26 14:55:59 2010 +0000 |
| committer | David Woodhouse <David.Woodhouse@intel.com> | Fri Mar 26 14:55:59 2010 +0000 |
| tree | e080a5c70df40f3ae8cf28a95a3267757668ab97 | |
| parent | 395b228858778d3c44f7c413693a6acaa8bb62dc [diff] | |
| parent | 220bf991b0366cc50a94feede3d7341fa5710ee4 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/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().