diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-18 22:34:47 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-18 22:34:47 +0100 |
| commit | a0a55682b83fd5f012afadcf415b030d7424ae68 (patch) | |
| tree | 97ad3cb7e3443f09fbe55f57d3c36994b20a8e52 /fs/reiserfs/ioctl.c | |
| parent | Merge branches 'at91', 'dcache', 'ftrace', 'hwbpt', 'misc', 'mmci', 's3c', 'st-ux' and 'unwind' into devel (diff) | |
| parent | ARM: add register documentation for __enable_mmu (diff) | |
| download | linux-dev-a0a55682b83fd5f012afadcf415b030d7424ae68.tar.xz linux-dev-a0a55682b83fd5f012afadcf415b030d7424ae68.zip | |
Merge branch 'hotplug' into devel
Conflicts:
arch/arm/kernel/head-common.S
Diffstat (limited to 'fs/reiserfs/ioctl.c')
0 files changed, 0 insertions, 0 deletions