summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Chauvet <kwizart@gmail.com>2014-07-01 00:04:10 +0200
committerNicolas Chauvet <kwizart@gmail.com>2014-07-07 16:21:57 +0200
commit417cd071bef94967fbab21c95222b0f828a7189a (patch)
tree07ab8d10609cdeb6f541cbd97c55dbfa3f9331a3
parent11b664c02eb93d8ebd63a154f66aacefe281f9f5 (diff)
downloadkernel-417cd071bef94967fbab21c95222b0f828a7189a.tar.gz
kernel-417cd071bef94967fbab21c95222b0f828a7189a.tar.xz
kernel-417cd071bef94967fbab21c95222b0f828a7189a.zip
Apply tagr drm - race free patches
-rw-r--r--kernel.spec13
1 files changed, 12 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 7bda6365..021fee5f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -607,6 +607,12 @@ Patch15000: nowatchdog-on-virt.patch
Patch21020: arm-tegra-usb-no-reset-linux33.patch
Patch21021: tegra-bp-next-3.17.patch
+# Tegra race-free
+Patch21031: linux-arm-tagr-01_04-drm_fb-helper.patch
+Patch21032: linux-arm-tagr-02_04-drm_constify_struct.patch
+Patch21033: linux-arm-tagr-03_04-drm-introduce.patch
+Patch21034: linux-arm-tagr-04_04-drm-race_free.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
@@ -1260,7 +1266,12 @@ ApplyPatch 0004-NOT_FOR_UPSTREAM-staging-nvec-remove-lid-and-power-e.patch
ApplyPatch 0005-NOT_FOR_UPSTREAM-staging-nvec-update-TODO.patch
-ApplyPatch linux-3.15-tagr.patch
+#ApplyPatch linux-arm-tagr-01_04-drm_fb-helper.patch
+ApplyPatch linux-arm-tagr-02_04-drm_constify_struct.patch
+ApplyPatch linux-arm-tagr-03_04-drm-introduce.patch
+ApplyPatch linux-arm-tagr-04_04-drm-race_free.patch
+
+#ApplyPatch linux-3.15-tagr.patch
#
# bugfixes to drivers and filesystems