aboutsummaryrefslogtreecommitdiffstats
path: root/series
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2010-09-05 00:25:04 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-09-05 00:25:04 -0700
commiteea487fa0daadea3dbe2c25b9db5881976643e09 (patch)
tree38e1a3006075a2d2d9e412a89c1b00a843ec4196 /series
parent1a868133510faafb3747084d87a785afa1b6eb66 (diff)
downloadpatches-eea487fa0daadea3dbe2c25b9db5881976643e09.tar.gz
staging revert patch
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