diff options
author | 2010-03-02 23:29:32 +0000 | |
---|---|---|
committer | 2010-03-02 23:29:32 +0000 | |
commit | b93a4afcff7be859e30cad2a305731516057d6cf (patch) | |
tree | fb5fe55864e16527e453efd18790a34db22ee2a1 /kernel/sysctl.c | |
parent | [ARM] pxa: fix typo in mxm8x10.h (diff) | |
parent | Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/master (diff) | |
download | linux-dev-b93a4afcff7be859e30cad2a305731516057d6cf.tar.xz linux-dev-b93a4afcff7be859e30cad2a305731516057d6cf.zip |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'kernel/sysctl.c')
0 files changed, 0 insertions, 0 deletions