a3f45c4 Merge branch 'kernel-git' strategy 'theirs'

Merged and Committed by Kyle McMartin 13 years ago
43 files changed. 484 lines added. 3395 lines removed.
.gitignore
file modified
+2 -2
Makefile
file modified
+8 -2
acpi-ec-add-delay-before-write.patch
file modified
+2 -3
acpi-update-battery-information-on-notification-0x81.patch
file modified
+2 -2
btusb-macbookpro-6-2.patch
file removed
-41
btusb-macbookpro-7-1.patch
file removed
-42
config-arm
file modified
+7 -0
config-debug
file modified
+5 -1
config-generic
file modified
+98 -9
config-nodebug
file modified
+8 -4
config-powerpc-generic
file modified
+2 -0
config-s390x
file modified
+5 -0
config-sparc64-generic
file modified
+2 -0
config-x86-generic
file modified
+20 -1
config-x86_64-generic
file modified
+18 -0
debug-tty-print-dev-name.patch
file modified
+7 -7
drm-intel-big-hammer.patch
file modified
+13 -8
drm-intel-edp-fixes.patch
file added
+44
drm-intel-make-lvds-work.patch
file modified
+13 -9
hdpvr-ir-enable.patch
file modified
+12 -3
kernel.spec
file modified
+95 -138
linux-2.6-32bit-mmap-exec-randomization.patch
file modified
+1 -1
linux-2.6-bluetooth-autosuspend.patch
file removed
-159
linux-2.6-crash-driver.patch
file modified
+10 -14
linux-2.6-enable-more-pci-autosuspend.patch
file modified
+84 -192
linux-2.6-i386-nx-emulation.patch
file modified
+1 -1
linux-2.6-qcserial-autosuspend.patch
file removed
-23
linux-2.6-utrace-ptrace.patch
file modified
+19 -16
linux-2.6-utrace.patch
file modified
+3 -3
linux-2.6-uvc-autosuspend.patch
file removed
-22
pci-crs-fixes.patch
file removed
-593
runtime_pm_fixups.patch
file modified
+1 -1
sources
file modified
+2 -2
wacom-01-add-fuzz-parameters-to-features.patch
file removed
-69
wacom-02-parse-the-bamboo-device-family.patch
file removed
-122
wacom-03-collect-device-quirks-into-single-function.patch
file removed
-107
wacom-04-add-support-for-the-bamboo-touch-trackpad.patch
file removed
-172
wacom-05-add-a-quirk-for-low-resolution-bamboo-devices.patch
file removed
-69
wacom-06-request-tablet-data-for-bamboo-pens.patch
file removed
-55
wacom-07-move-bamboo-touch-irq-to-its-own-function.patch
file removed
-52
wacom-08-add-support-for-bamboo-pen.patch
file removed
-130
wacom-09-disable-bamboo-touchpad-when-pen-is-being-used.patch
file removed
-31
xhci_hcd-suspend-resume.patch
file removed
-1289
    Merge branch 'kernel-git' strategy 'theirs'
    
    Conflicts:
    	xhci_hcd-suspend-resume.patch
    
        
file modified
+2 -2
file modified
+8 -2
file modified
+7 -0
file modified
+5 -1
file modified
+98 -9
file modified
+8 -4
file modified
+2 -0
file modified
+5 -0
file modified
+2 -0
file modified
+20 -1
file modified
+18 -0
file modified
+13 -8
file modified
+12 -3
file modified
+95 -138
file modified
+10 -14
file modified
+19 -16
file modified
+3 -3
file removed
-593
file modified
+1 -1
file modified
+2 -2