diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:22:31 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:22:31 +0200 |
| commit | 32a82e38679501da738199135b35f93ddc8aca0a (patch) | |
| tree | ed280e079a8bab790b3dba5f62f1d300ada7540b /target/linux/patches | |
| parent | 90d5c8b73e8d538e121275b12e714332ca785cff (diff) | |
| parent | 86c05906d3e804b41b9280c226a3a07f6fad5f27 (diff) | |
resolve conflicts
Diffstat (limited to 'target/linux/patches')
| -rw-r--r-- | target/linux/patches/3.4.65/bsd-compatibility.patch (renamed from target/linux/patches/3.4.60/bsd-compatibility.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.4.65/cris-etrax.patch (renamed from target/linux/patches/3.4.60/cris-etrax.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.4.65/defaults.patch (renamed from target/linux/patches/3.4.60/defaults.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.4.65/gemalto.patch (renamed from target/linux/patches/3.4.60/gemalto.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.4.65/lemote-rfkill.patch (renamed from target/linux/patches/3.4.60/lemote-rfkill.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.4.65/module-alloc-size-check.patch (renamed from target/linux/patches/3.4.60/module-alloc-size-check.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.4.65/non-static.patch (renamed from target/linux/patches/3.4.60/non-static.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.4.65/sparc-include.patch (renamed from target/linux/patches/3.4.60/sparc-include.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.4.65/startup.patch (renamed from target/linux/patches/3.4.60/startup.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.4.65/usb-defaults-off.patch (renamed from target/linux/patches/3.4.60/usb-defaults-off.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.4.65/uuid.patch (renamed from target/linux/patches/3.4.60/uuid.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.4.65/vga-cons-default-off.patch (renamed from target/linux/patches/3.4.60/vga-cons-default-off.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.4.65/wlan-cf.patch (renamed from target/linux/patches/3.4.60/wlan-cf.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/3.4.65/zlib-inflate.patch (renamed from target/linux/patches/3.4.60/zlib-inflate.patch) | 0 |
14 files changed, 0 insertions, 0 deletions
diff --git a/target/linux/patches/3.4.60/bsd-compatibility.patch b/target/linux/patches/3.4.65/bsd-compatibility.patch index 9e91a62de..9e91a62de 100644 --- a/target/linux/patches/3.4.60/bsd-compatibility.patch +++ b/target/linux/patches/3.4.65/bsd-compatibility.patch diff --git a/target/linux/patches/3.4.60/cris-etrax.patch b/target/linux/patches/3.4.65/cris-etrax.patch index a80d9a8b8..a80d9a8b8 100644 --- a/target/linux/patches/3.4.60/cris-etrax.patch +++ b/target/linux/patches/3.4.65/cris-etrax.patch diff --git a/target/linux/patches/3.4.60/defaults.patch b/target/linux/patches/3.4.65/defaults.patch index 58aae610b..58aae610b 100644 --- a/target/linux/patches/3.4.60/defaults.patch +++ b/target/linux/patches/3.4.65/defaults.patch diff --git a/target/linux/patches/3.4.60/gemalto.patch b/target/linux/patches/3.4.65/gemalto.patch index 65f7af1d7..65f7af1d7 100644 --- a/target/linux/patches/3.4.60/gemalto.patch +++ b/target/linux/patches/3.4.65/gemalto.patch diff --git a/target/linux/patches/3.4.60/lemote-rfkill.patch b/target/linux/patches/3.4.65/lemote-rfkill.patch index a61488434..a61488434 100644 --- a/target/linux/patches/3.4.60/lemote-rfkill.patch +++ b/target/linux/patches/3.4.65/lemote-rfkill.patch diff --git a/target/linux/patches/3.4.60/module-alloc-size-check.patch b/target/linux/patches/3.4.65/module-alloc-size-check.patch index a792ac60a..a792ac60a 100644 --- a/target/linux/patches/3.4.60/module-alloc-size-check.patch +++ b/target/linux/patches/3.4.65/module-alloc-size-check.patch diff --git a/target/linux/patches/3.4.60/non-static.patch b/target/linux/patches/3.4.65/non-static.patch index a967703d0..a967703d0 100644 --- a/target/linux/patches/3.4.60/non-static.patch +++ b/target/linux/patches/3.4.65/non-static.patch diff --git a/target/linux/patches/3.4.60/sparc-include.patch b/target/linux/patches/3.4.65/sparc-include.patch index 2f8ffd061..2f8ffd061 100644 --- a/target/linux/patches/3.4.60/sparc-include.patch +++ b/target/linux/patches/3.4.65/sparc-include.patch diff --git a/target/linux/patches/3.4.60/startup.patch b/target/linux/patches/3.4.65/startup.patch index 68e8987b0..68e8987b0 100644 --- a/target/linux/patches/3.4.60/startup.patch +++ b/target/linux/patches/3.4.65/startup.patch diff --git a/target/linux/patches/3.4.60/usb-defaults-off.patch b/target/linux/patches/3.4.65/usb-defaults-off.patch index 31367108a..31367108a 100644 --- a/target/linux/patches/3.4.60/usb-defaults-off.patch +++ b/target/linux/patches/3.4.65/usb-defaults-off.patch diff --git a/target/linux/patches/3.4.60/uuid.patch b/target/linux/patches/3.4.65/uuid.patch index ca23accdf..ca23accdf 100644 --- a/target/linux/patches/3.4.60/uuid.patch +++ b/target/linux/patches/3.4.65/uuid.patch diff --git a/target/linux/patches/3.4.60/vga-cons-default-off.patch b/target/linux/patches/3.4.65/vga-cons-default-off.patch index 178aeeeb9..178aeeeb9 100644 --- a/target/linux/patches/3.4.60/vga-cons-default-off.patch +++ b/target/linux/patches/3.4.65/vga-cons-default-off.patch diff --git a/target/linux/patches/3.4.60/wlan-cf.patch b/target/linux/patches/3.4.65/wlan-cf.patch index fc20759e2..fc20759e2 100644 --- a/target/linux/patches/3.4.60/wlan-cf.patch +++ b/target/linux/patches/3.4.65/wlan-cf.patch diff --git a/target/linux/patches/3.4.60/zlib-inflate.patch b/target/linux/patches/3.4.65/zlib-inflate.patch index 58e1f6d21..58e1f6d21 100644 --- a/target/linux/patches/3.4.60/zlib-inflate.patch +++ b/target/linux/patches/3.4.65/zlib-inflate.patch |