diff options
author | Josh Boyer <jwboyer@redhat.com> | 2012-01-20 13:32:57 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2012-01-20 13:32:57 -0500 |
commit | e8409b1dce1d927283cb4999d9902b8cda4f86fc (patch) | |
tree | aebdcb0443b56c5cee9135f08f5cf8b9678d76e6 /config-arm-generic | |
parent | 0a621ccdd414267ae3ff952951be5547f0512383 (diff) | |
download | kernel-e8409b1dce1d927283cb4999d9902b8cda4f86fc.tar.gz kernel-e8409b1dce1d927283cb4999d9902b8cda4f86fc.tar.xz kernel-e8409b1dce1d927283cb4999d9902b8cda4f86fc.zip |
Rebase to Linux 3.3-rc1
The utrace patch is left unapplied as it doesn't apply cleanly any longer
Diffstat (limited to 'config-arm-generic')
-rw-r--r-- | config-arm-generic | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config-arm-generic b/config-arm-generic index f20170546..abd9f3c5a 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -200,3 +200,4 @@ CONFIG_ARM_ERRATA_751472=y # CONFIG_NET_VENDOR_CIRRUS is not set # CONFIG_CS89x0 is not set +# CONFIG_OF_SELFTEST is not set |