aboutsummaryrefslogtreecommitdiffstats
path: root/series
diff options
Diffstat (limited to 'series')
-rw-r--r--series3
1 files changed, 3 insertions, 0 deletions
diff --git a/series b/series
index 1c0f99fd42da6e..c05edc703f99fe 100644
--- a/series
+++ b/series
@@ -56,6 +56,9 @@ staging.current/staging-spectra-depend-on-x86_mrst.patch
staging.current/staging-octeon-depends-on-netdevices.patch
staging.current/staging-wlan-ng-explicitly-set-some-fields-in-cfg80211-interface.patch
+# after patches sent to linus
+staging.current/revert-staging-batman-adv-adding-netfilter-bridge-hooks.patch
+
#####################################################################
# Stuff to be merged after 2.6.36 is out