aboutsummaryrefslogtreecommitdiffstats
path: root/series
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2010-02-25 09:53:09 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2010-02-25 09:53:09 -0800
commit3dd30f4509d44d904fd39b885113b86963d3c04f (patch)
tree12279bd61c3f8301c9d98e82d587b18d385d43f7 /series
parent5eb089ecb9f6bedf9077bbf1d5940745d059e120 (diff)
downloadpatches-3dd30f4509d44d904fd39b885113b86963d3c04f.tar.gz
staging.dup stuff and sync with 2.6.33
Diffstat (limited to 'series')
-rw-r--r--series8
1 files changed, 8 insertions, 0 deletions
diff --git a/series b/series
index 35cb6e4daf766b..2724047e229aba 100644
--- a/series
+++ b/series
@@ -621,3 +621,11 @@ staging/staging-udlfb-remove-printk-and-small-cleanup.patch
staging/staging-rtl8187se-needs-semaphore.h.patch
+# merge fun :(
+#staging.dup/staging-comedi-poc-fix-coding-style-issues.patch
+#staging.dup/staging-comedi-pcmad-checkpatch-cleanups.patch
+#staging.dup/staging-comedi-fix-bracing-coding-style-issue-in-ni_65xx.c.patch
+#staging.dup/staging-comedi-fix-bracing-coding-style-and-80-character-issues-in-ni_660x.c.patch
+#staging.dup/staging-dream-camera-msm_camera-fix-coding-style-issues.patch
+#staging.dup/staging-wlan-ng-fix-most-of-the-style-issues-in-hfa384x.h.patch
+