diff options
author | 2010-03-02 23:40:15 +0000 | |
---|---|---|
committer | 2010-03-02 23:40:15 +0000 | |
commit | 882d01f96bc1909455696aae6eb7ce4df3e908c8 (patch) | |
tree | 06e5789cb33d0547c2497fd4d0327dc9e8614d37 /kernel/sysctl.c | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable (diff) | |
parent | ARM: S3C64XX: Add initial support for board specific IRQs (diff) | |
download | linux-dev-882d01f96bc1909455696aae6eb7ce4df3e908c8.tar.xz linux-dev-882d01f96bc1909455696aae6eb7ce4df3e908c8.zip |
Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Diffstat (limited to 'kernel/sysctl.c')
0 files changed, 0 insertions, 0 deletions