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

Conflicts:

	queue-2.6.16/series

diff --cc queue-2.6.16/series
index 09b90d25798ccc8ea8df9326565e77ce59154015,c2ed59b0ad5ca1ad1ed8ee95c1895c510eb0d7fd..49ec7dd5c418a0e8565c7cebfc5e54ba60b323a4
--- 1/queue-2.6.16/series
--- 2/queue-2.6.16/series
+++ b/queue-2.6.16/series
@@@ -3,13 -3,7 +3,17 @@@ v4l-dvb-fix-samsung-tuner-frequency-ran
  kconfig-video_decoder-must-select-fw_loader.patch
  2.6.xx-sata_mv-another-critical-fix.patch
  tcp-do-not-use-inet-id-of-global-tcp_socket-when-sending-rst.patch
+ driver-0001-sysfs-sysfs_remove_dir-needs-to-invalidate-the-dentry.patch
+ driver-0014-firmware-fix-BUG-in-fw_realloc_buffer.patch
+ driver-0021-get_cpu_sysdev-signedness-fix.patch
+ driver-0023-sysfs-fix-a-kobject-leak-in-sysfs_add_link-on-the-error-path.patch
 +xfs-writeout-fix.patch
 +net-ensure-device-name-passed-to-so_bindtodevice-is-null-terminated.patch
 +i810fb_cursor-use-gfp_atomic.patch
 +v9fs-assign-dentry-ops-to-negative-dentries.patch
 +dm-bio-split-bvec-fix.patch
 +rtc.h-broke-strace-builds.patch
 +proc-fix-duplicate-line-in-proc-devices.patch
 +fix-scheduler-deadlock.patch
 +dm-fix-bug-bio_rw_barrier-requests-to-md-raid1-hang.patch
 +cciss-fix-use-after-free-in-cciss_init_one.patch