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

Conflicts:

	queue-2.6.20/series

diff --cc queue-2.6.20/series
index b4d27255f3843c8263d88818444828ee8fa464c3,7d377a288b967ee76442dc5fc8bc11de5416dc70..3694d3eecf158eb65e45bd83edbd86c97504df88
--- 1/queue-2.6.20/series
--- 2/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