diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-01 08:46:18 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-01 08:46:18 +0100 |
| commit | 1126dddbf48bbd892d5c63675058328cf92fa94f (patch) | |
| tree | 95ac36134d33267d42b00ae75bcd890ac70965bb /baseconfig | |
| parent | 51001d2d90f0b5218fefe329651d06f66e1c610e (diff) | |
| parent | 1652b3b29eb207a6455cf6389a0b92b41ecb5e04 (diff) | |
| download | kernel-4.11.0-0.rc0.git6.1.vanilla.knurd.1.fc26.tar.gz kernel-4.11.0-0.rc0.git6.1.vanilla.knurd.1.fc26.tar.xz kernel-4.11.0-0.rc0.git6.1.vanilla.knurd.1.fc26.zip | |
merge masterkernel-4.11.0-0.rc0.git6.1.vanilla.knurd.1.fc26kernel-4.11.0-0.rc0.git6.1.vanilla.knurd.1.fc25kernel-4.11.0-0.rc0.git6.1.vanilla.knurd.1.fc24
Diffstat (limited to 'baseconfig')
| -rw-r--r-- | baseconfig/CONFIG_CGROUP_RDMA | 1 | ||||
| -rw-r--r-- | baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I | 2 | ||||
| -rw-r--r-- | baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/baseconfig/CONFIG_CGROUP_RDMA b/baseconfig/CONFIG_CGROUP_RDMA new file mode 100644 index 000000000..94ae4f4bc --- /dev/null +++ b/baseconfig/CONFIG_CGROUP_RDMA @@ -0,0 +1 @@ +# CONFIG_CGROUP_RDMA is not set diff --git a/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I b/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I index e47c19e7e..7c9597c70 100644 --- a/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I +++ b/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I @@ -1 +1 @@ -CONFIG_RTC_DRV_SUN6I=m +# CONFIG_RTC_DRV_SUN6I is not set diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I b/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I index e47c19e7e..7c9597c70 100644 --- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I +++ b/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I @@ -1 +1 @@ -CONFIG_RTC_DRV_SUN6I=m +# CONFIG_RTC_DRV_SUN6I is not set |