From: Chris Wright <chrisw@sous-sol.org>
Date: Wed, 6 Jun 2007 20:52:15 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/stable/stable... 
X-Git-Tag: v2.6.20.13~10^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9ed3a443c002870350340e84e51e92f41d7a01c;p=thirdparty%2Fkernel%2Fstable-queue.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue

Conflicts:

	queue-2.6.20/series
---

e9ed3a443c002870350340e84e51e92f41d7a01c
diff --cc queue-2.6.20/series
index b4d27255f38,7d377a288b9..3694d3eecf1
--- a/queue-2.6.20/series
+++ b/queue-2.6.20/series
@@@ -11,6 -11,5 +11,8 @@@ crypto-api-read-module-pointer-before-f
  fuse-fix-mknod-of-regular-file.patch
  acpi-thermal-fix-mod_timer-interval.patch
  alsa-usb-audio-explicitly-match-logitech-quickcam.patch
+ 02-network.diff
+ 01-data-corruption.diff
 +v4l-dvb-budget-ci-fix-tuning-for-tdm-1316.patch
 +kbuild-fixdep-segfault-on-pathological-string-o-death.patch
 +ntfs_init_locked_inode-fix-array-indexing.patch