summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorNicolas Chauvet <kwizart@gmail.com>2014-06-02 21:51:28 +0200
committerNicolas Chauvet <kwizart@gmail.com>2014-07-07 16:21:17 +0200
commit33114ec6ba07e8ce38353b92a0554f9a71e83535 (patch)
tree2ef3cb36cdb930e79ff9dc7d0b12e0ad69b59790 /kernel.spec
parenta34e5ddbb0300885755e268f2f9ddab6bdbd284c (diff)
downloadkernel-33114ec6ba07e8ce38353b92a0554f9a71e83535.tar.gz
kernel-33114ec6ba07e8ce38353b92a0554f9a71e83535.tar.xz
kernel-33114ec6ba07e8ce38353b92a0554f9a71e83535.zip
Add marvin24s patches
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec15
1 files changed, 15 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 5e09d5bd..58b2dbc4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -606,6 +606,14 @@ Patch15000: nowatchdog-on-virt.patch
# ARMv7
Patch21020: arm-tegra-usb-no-reset-linux33.patch
+#Patches from marvin24s linux-ac100-3.14 branch
+# git://gitorious.org/~marvin24/ac100/marvin24s-kernel.git
+Patch21201: 0001-rt2x00-move-frequent-messages-to-debug-level.patch
+Patch21202: 0002-NOT_FOR_UPSTREAM-staging-nvec-move-led-init-out-of-p.patch
+Patch21203: 0003-NOT_FOR_UPSTREAM-staging-nvec-add-support-for-lid-an.patch
+Patch21204: 0004-NOT_FOR_UPSTREAM-staging-nvec-remove-lid-and-power-e.patch
+Patch21205: 0005-NOT_FOR_UPSTREAM-staging-nvec-update-TODO.patch
+
#rhbz 754518
Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@@ -1240,6 +1248,13 @@ ApplyPatch 0001-lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
#
ApplyPatch arm-tegra-usb-no-reset-linux33.patch
+ApplyPatch 0001-rt2x00-move-frequent-messages-to-debug-level.patch
+ApplyPatch 0002-NOT_FOR_UPSTREAM-staging-nvec-move-led-init-out-of-p.patch
+ApplyPatch 0003-NOT_FOR_UPSTREAM-staging-nvec-add-support-for-lid-an.patch
+ApplyPatch 0004-NOT_FOR_UPSTREAM-staging-nvec-remove-lid-and-power-e.patch
+ApplyPatch 0005-NOT_FOR_UPSTREAM-staging-nvec-update-TODO.patch
+
+
#
# bugfixes to drivers and filesystems
#