diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-04-27 18:16:19 (GMT) |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-27 18:16:19 (GMT) |
| commit | d1da4e50e5d09f02c340927a4fcb7f54202fa033 (patch) | |
| tree | 7f98317bdd45dbdb7644e9179891c5af6a3a8ef1 /arch/s390/kernel/compat_ptrace.h | |
| parent | 78ab67da1002d954ea4c3e2b441e2483c41f94e8 (diff) | |
| parent | a205752d1ad2d37d6597aaae5a56fc396a770868 (diff) | |
| download | linux-fsl-qoriq-d1da4e50e5d09f02c340927a4fcb7f54202fa033.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/Kconfig
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'arch/s390/kernel/compat_ptrace.h')
0 files changed, 0 insertions, 0 deletions