update to patch-2.6.26-rc1-git7

nuke upstream merge media build fix
first patch conflict too, ah the pleasure of pruning

svn path=/dists/trunk/linux-2.6/; revision=11341

debian/patches/bugfix/all/drivers-media-build.patch

@@ -1,13 +0,0 @@
-diff --git a/drivers/media/Makefile b/drivers/media/Makefile
-index 73f742c..cc11c4c 100644
---- a/drivers/media/Makefile
-+++ b/drivers/media/Makefile
-@@ -2,6 +2,8 @@
- # Makefile for the kernel multimedia device drivers.
- #
- 
-+obj-y := common/
-+
- obj-$(CONFIG_VIDEO_MEDIA) += common/
- 
- # Since hybrid devices are here, should be compiled if DVB and/or V4L

debian/patches/series/1~experimental.1

@@ -1,4 +1,4 @@
-+ bugfix/all/patch-2.6.26-rc1-git6
++ bugfix/all/patch-2.6.26-rc1-git7
 + debian/version.patch
 + debian/kernelvariables.patch
 + debian/doc-build-parallel.patch
@@ -36,4 +36,3 @@
 ##+ features/all/mtd-nor-add-support-for-the-st-m29w400db-flash-chip.patch
 + bugfix/all/mtd-prevent-physmap-from-causing-request_module-runaway-loop-modprobe-net-pf-1.patch
 + bugfix/all/0001--USB-c67x00-build-fix.patch
-+ bugfix/all/drivers-media-build.patch