diff options
author | 2009-03-26 23:10:11 +0000 | |
---|---|---|
committer | 2009-03-26 23:10:11 +0000 | |
commit | 542f869f1826f092606efd0c4c771f070d1314f5 (patch) | |
tree | 9c9d265ab0c87ea7862ccb70933f33d3d7011334 /kernel/softirq.c | |
parent | Merge branch 'next-s3c64xx-regs' of git://aeryn.fluff.org.uk/bjdooks/linux into devel (diff) | |
parent | Gemini: Add support for Teltonika RUT100 (diff) | |
download | wireguard-linux-542f869f1826f092606efd0c4c771f070d1314f5.tar.xz wireguard-linux-542f869f1826f092606efd0c4c771f070d1314f5.zip |
Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel
Conflicts:
arch/arm/mm/Kconfig
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'kernel/softirq.c')
0 files changed, 0 insertions, 0 deletions