Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream

2026-09-26 18:16:26 +00:00 · 2008-12-08 16:18:47 +00:00 · 2008-12-08 16:18:47 +00:00 · c35fa3ea1a
commit c35fa3ea1a
parent dcc7461eef 218d11a8b0
455 changed files with 9134 additions and 4952 deletions
--- a/include/acpi/acpredef.h
+++ b/include/acpi/acpredef.h
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
--- a/include/linux/page_cgroup.h
+++ b/include/linux/page_cgroup.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/include/linux/security.h
+++ b/include/linux/security.h
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
--- a/include/net/request_sock.h
+++ b/include/net/request_sock.h
--- a/include/net/timewait_sock.h
+++ b/include/net/timewait_sock.h
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h