diff options
| author | David Woodhouse | 2010-03-26 15:55:59 +0100 |
|---|---|---|
| committer | David Woodhouse | 2010-03-26 15:55:59 +0100 |
| commit | 329f9052dbadf6f4afe2231668bd00c579a4aa10 (patch) | |
| tree | e080a5c70df40f3ae8cf28a95a3267757668ab97 /lib/locking-selftest-wlock-hardirq.h | |
| parent | mtd/maps/pismo: remove dangling pointer and a leak (diff) | |
| parent | Linux 2.6.34-rc2 (diff) | |
| download | kernel-qcow2-linux-329f9052dbadf6f4afe2231668bd00c579a4aa10.tar.gz kernel-qcow2-linux-329f9052dbadf6f4afe2231668bd00c579a4aa10.tar.xz kernel-qcow2-linux-329f9052dbadf6f4afe2231668bd00c579a4aa10.zip | |
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().
Diffstat (limited to 'lib/locking-selftest-wlock-hardirq.h')
0 files changed, 0 insertions, 0 deletions