Merge 2.6.38-rc5 into usb-next

This is needed to resolve some merge conflicts that were found in the USB host controller patches, and reported by Stephen Rothwell. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2026-10-14 05:55:17 +00:00 · 2011-02-17 09:56:40 -08:00 · 2011-02-17 09:56:40 -08:00 · 66b0835e2b
commit 66b0835e2b
parent 479b46b559 85e2efbb1d
1107 changed files with 23279 additions and 16641 deletions
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
--- a/include/linux/caif/Kbuild
+++ b/include/linux/caif/Kbuild
--- a/include/linux/console.h
+++ b/include/linux/console.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
--- a/include/linux/input/bu21013.h
+++ b/include/linux/input/bu21013.h
--- a/include/linux/input/matrix_keypad.h
+++ b/include/linux/input/matrix_keypad.h
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
--- a/include/linux/klist.h
+++ b/include/linux/klist.h
--- a/include/linux/kmemcheck.h
+++ b/include/linux/kmemcheck.h
--- a/include/linux/mmc/sh_mmcif.h
+++ b/include/linux/mmc/sh_mmcif.h
--- a/include/linux/module.h
+++ b/include/linux/module.h
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
--- a/include/linux/mroute6.h
+++ b/include/linux/mroute6.h
--- a/include/linux/nfsacl.h
+++ b/include/linux/nfsacl.h
--- a/include/linux/oprofile.h
+++ b/include/linux/oprofile.h
--- a/include/linux/posix_acl.h
+++ b/include/linux/posix_acl.h
--- a/include/linux/res_counter.h
+++ b/include/linux/res_counter.h
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
--- a/include/linux/security.h
+++ b/include/linux/security.h
--- a/include/linux/sunrpc/bc_xprt.h
+++ b/include/linux/sunrpc/bc_xprt.h
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
--- a/include/linux/sysrq.h
+++ b/include/linux/sysrq.h
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
--- a/include/linux/usb/cdc.h
+++ b/include/linux/usb/cdc.h
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
--- a/include/linux/usb/msm_hsusb_hw.h
+++ b/include/linux/usb/msm_hsusb_hw.h
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
--- a/include/linux/virtio_console.h
+++ b/include/linux/virtio_console.h
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
--- a/include/net/netfilter/nf_conntrack_ecache.h
+++ b/include/net/netfilter/nf_conntrack_ecache.h
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
--- a/include/net/sock.h
+++ b/include/net/sock.h
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h